diff options
author | Joas Schilling <coding@schilljs.com> | 2017-11-14 17:21:16 +0100 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2017-11-14 17:21:16 +0100 |
commit | 3820d6883dffcaa49deb1054ae0f32ab3d3e39b1 (patch) | |
tree | 2c7112e31bf0b219e6863e51f9c95bc98a814f2c /lib/private/Share20 | |
parent | f376659933ab54b42df1b179293c741a24ac36cc (diff) | |
download | nextcloud-server-3820d6883dffcaa49deb1054ae0f32ab3d3e39b1.tar.gz nextcloud-server-3820d6883dffcaa49deb1054ae0f32ab3d3e39b1.zip |
Fix accesslist when a user has an ID only containting 0-9
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private/Share20')
-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; } |