Merge pull request #7168 from nextcloud/fix-user-list

Fix accesslist when a user has an ID only containting 0-9
This commit is contained in:
blizzz 2017-11-23 12:17:11 +01:00 committed by GitHub
commit 98cdd9885f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1390,7 +1390,7 @@ class Manager implements IManager {
foreach ($tmp as $k => $v) {
if (isset($al[$k])) {
if (is_array($al[$k])) {
$al[$k] = array_merge($al[$k], $v);
$al[$k] += $v;
} else {
$al[$k] = $al[$k] || $v;
}