diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 892256d3806..cc3709745a4 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -10369,9 +10369,9 @@ abstract class CommonObject } $keys_with_alias[] = $alias . '.' . $fieldname; } - return implode(',', $keys_with_alias); + return implode(', ', $keys_with_alias); } else { - return implode(',', $keys); + return implode(', ', $keys); } } diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php index a8ba27af910..f783399cc83 100644 --- a/htdocs/core/modules/modUser.class.php +++ b/htdocs/core/modules/modUser.class.php @@ -376,8 +376,6 @@ class modUser extends DolibarrModules */ public function init($options = '') { - global $conf; - // Permissions $this->remove($options); diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php index b21323934b8..47c5f0a7e2a 100644 --- a/test/phpunit/AllTests.php +++ b/test/phpunit/AllTests.php @@ -286,10 +286,6 @@ class AllTests require_once dirname(__FILE__).'/ScriptsTest.php'; $suite->addTestSuite('ScriptsTest'); - require_once dirname(__FILE__).'/ModulesTest.php'; // At end because it's the longer - $suite->addTestSuite('ModulesTest'); - - // GUI require_once dirname(__FILE__).'/FormAdminTest.php'; $suite->addTestSuite('FormAdminTest'); @@ -311,6 +307,10 @@ class AllTests require_once dirname(__FILE__).'/WebsiteTest.php'; $suite->addTestSuite('WebsiteTest'); + // At end because it's the longer + require_once dirname(__FILE__).'/ModulesTest.php'; + $suite->addTestSuite('ModulesTest'); + return $suite; } } diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php index c08f0bba7e7..d1cb7a94c8b 100644 --- a/test/phpunit/ModulesTest.php +++ b/test/phpunit/ModulesTest.php @@ -90,10 +90,12 @@ class ModulesTest extends CommonClassTest // TestCase //CommonClassTest $mod = new $class($db); $result = $mod->remove(); + print __METHOD__." test remove for module ".$modlabel.", result=".$result."\n"; + $result = $mod->init(); + print __METHOD__." test init for module ".$modlabel.", result=".$result."\n"; $this->assertLessThan($result, 0, $modlabel." ".$mod->error); - print __METHOD__." test remove/init for module ".$modlabel.", result=".$result."\n"; if ($modlabel == 'User') { print __METHOD__." test table llx_user exists after Webhook init\n";