Merge pull request #9704 from atm-gauthier/7.0_fix_userlist

FIX : when we're just admin and not super admin, if we create new use…
This commit is contained in:
Laurent Destailleur 2018-10-09 16:17:49 +02:00 committed by GitHub
commit bd8cf3d81e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -194,7 +194,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u2 ON u.fk_user = u2.rowid";
// TODO add hook
if (! empty($conf->multicompany->enabled)) {
if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
if (! empty($user->admin) && empty($user->entity)) {
if (! empty($user->admin)) {
if ($conf->entity == 1) {
$sql.= " WHERE u.entity IS NOT NULL";
} else {