mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
parent 106d932e8f 3820d6883d
commit 98cdd9885f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Share20/Manager.php
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;
}