Merge pull request #7262 from nextcloud/backport/7168/files-access-list-with-integer-userid

[stable12] Fix accesslist when a user has an ID only containting 0-9
This commit is contained in:
Morris Jobke 2017-11-23 13:54:46 +01:00 committed by GitHub
commit b901f8b0c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

View File

@ -1407,7 +1407,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;
}