lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed warning

Browse Source
This commit is contained in:
Laurent Destailleur 2020-11-01 20:02:12 +01:00
parent 423db141f8
commit d6b6cacbe5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -133,6 +133,7 @@ install:
php-parallel-lint/php-console-highlighter ^0 \ php-parallel-lint/php-console-highlighter ^0 \
squizlabs/php_codesniffer ^3 squizlabs/php_codesniffer ^3
fi fi
# phpunit 9 is required for php 8
if [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then if [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
composer -n require --ignore-platform-reqs phpunit/phpunit ^7 \ composer -n require --ignore-platform-reqs phpunit/phpunit ^7 \
php-parallel-lint/php-parallel-lint ^1.2 \ php-parallel-lint/php-parallel-lint ^1.2 \

3
htdocs/core/modules/DolibarrModules.class.php
View File

@ -1679,13 +1679,12 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
$r_id = $this->rights[$key][0]; $r_id = $this->rights[$key][0];
$r_desc = $this->rights[$key][1]; $r_desc = $this->rights[$key][1];
$r_type = isset($this->rights[$key][2]) ? $this->rights[$key][2] : ''; $r_type = isset($this->rights[$key][2]) ? $this->rights[$key][2] : '';
$r_def = $this->rights[$key][3]; $r_def = empty($this->rights[$key][3]) ? 0 : $this->rights[$key][3];
$r_perms = $this->rights[$key][4]; $r_perms = $this->rights[$key][4];
$r_subperms = isset($this->rights[$key][5]) ? $this->rights[$key][5] : ''; $r_subperms = isset($this->rights[$key][5]) ? $this->rights[$key][5] : '';
$r_modul = empty($this->rights_class) ?strtolower($this->name) : $this->rights_class; $r_modul = empty($this->rights_class) ?strtolower($this->name) : $this->rights_class;
if (empty($r_type)) { $r_type = 'w'; } if (empty($r_type)) { $r_type = 'w'; }
if (empty($r_def)) { $r_def = 0; }
// Search if perm already present // Search if perm already present
$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."rights_def"; $sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."rights_def";