summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-01-30 13:34:41 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2014-02-03 17:03:30 +0100
commit8ee368ddad976883e307f4d59bd839bab83e39b6 (patch)
tree08ab926dd6cf641a85ebbac74df5fdf2f8bfd23d
parent34069e00c497bf5651a041595411f876f79feecf (diff)
downloadnextcloud-server-8ee368ddad976883e307f4d59bd839bab83e39b6.tar.gz
nextcloud-server-8ee368ddad976883e307f4d59bd839bab83e39b6.zip
remove needless element tag
-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);
}
}