Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge remote-tracking branch 'upstream/develop' into zapieruser

Browse Source
This commit is contained in:
Frédéric FRANCE
2020-10-30 08:17:53 +01:00
parent 6fe4f85eec d4daf8b9ce
commit e4af61a587
42 changed files with 100 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/user/class/user.class.php
View File

@@ -681,7 +681,7 @@ class User extends CommonObject
} else {
$wherefordel = "module='".$this->db->escape($allmodule)."'";
if (!empty($allperms)) {
$whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
$wherefordel .= " AND perms='".$this->db->escape($allperms)."'";
}
}
}