]> source.dussan.org Git - nextcloud-server.git/commitdiff
remove needless element tag
authorBjoern Schiessle <schiessle@owncloud.com>
Thu, 30 Jan 2014 12:34:41 +0000 (13:34 +0100)
committerBjoern Schiessle <schiessle@owncloud.com>
Mon, 3 Feb 2014 16:03:52 +0000 (17:03 +0100)
apps/files_sharing/lib/api.php

index b3016749564594ad60229777ccd11ef9831324fd..d703ac32ab7da119c239edc6026a7818d590f3b6 100644 (file)
@@ -178,8 +178,7 @@ class Api {
                                $share['received_from_displayname'] = \OCP\User::getDisplayName($receivedFrom['uid_owner']);
                        }
                        if ($share) {
-                               $share['filename'] = $file['name'];
-                               $result[] = $share;
+                               $result = array_merge($result, $share);
                        }
                }