diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2017-11-23 12:17:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-23 12:17:11 +0100 |
| commit | 98cdd9885fdb3dfa01ad2d75d942215e4652bb2d (patch) | |
| tree | f1ebd60a550e2361a276a77a830f5a399a03c9cf /lib | |
| parent | 106d932e8fe3adbaec1e3d74b28cc0ebbc154823 (diff) | |
| parent | 3820d6883dffcaa49deb1054ae0f32ab3d3e39b1 (diff) | |
| download | nextcloud-server-98cdd9885fdb3dfa01ad2d75d942215e4652bb2d.tar.gz nextcloud-server-98cdd9885fdb3dfa01ad2d75d942215e4652bb2d.zip | |
Merge pull request #7168 from nextcloud/fix-user-list
Fix accesslist when a user has an ID only containting 0-9
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Share20/Manager.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index 4a31266bbe8..83fe4ec0d19 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -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; } |