summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-01-30 13:34:41 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2014-01-30 13:34:41 +0100
commitf9d9a62e587d1f61ad50803d04c50b5063273d70 (patch)
tree6e201f26f0c79af27dd3cbf76e5610627d4ffe51 /apps
parent299a8285bd2601ccbac988b2e3e9b067d47921a2 (diff)
downloadnextcloud-server-f9d9a62e587d1f61ad50803d04c50b5063273d70.tar.gz
nextcloud-server-f9d9a62e587d1f61ad50803d04c50b5063273d70.zip
remove needless element tag
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/lib/api.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/files_sharing/lib/api.php b/apps/files_sharing/lib/api.php
index f828a4e840d..061e60ad8ed 100644
--- a/apps/files_sharing/lib/api.php
+++ b/apps/files_sharing/lib/api.php
@@ -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);
}
}