]> source.dussan.org Git - nextcloud-server.git/commitdiff
Fix accesslist when a user has an ID only containting 0-9 7262/head
authorJoas Schilling <coding@schilljs.com>
Tue, 14 Nov 2017 16:21:16 +0000 (17:21 +0100)
committerJoas Schilling <coding@schilljs.com>
Thu, 23 Nov 2017 12:19:55 +0000 (13:19 +0100)
Signed-off-by: Joas Schilling <coding@schilljs.com>
lib/private/Share20/Manager.php

index d31a4e30dd6454e836123a63b673bcb8f8a0ff08..be019852ff39d50e3f63b0797090ea38ca6eafd8 100644 (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;
                                        }