diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2014-02-03 08:02:54 -0800 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2014-02-03 08:02:54 -0800 |
| commit | 9a0d7c5be4720ae68048b9bef20928f954abcf61 (patch) | |
| tree | 9657e71f396513d265c1935e2e49269c4e6e10df /apps | |
| parent | c0aeaf9ec0afd0f8d8f732d327a864dba6b2f34d (diff) | |
| parent | f9d9a62e587d1f61ad50803d04c50b5063273d70 (diff) | |
| download | nextcloud-server-9a0d7c5be4720ae68048b9bef20928f954abcf61.tar.gz nextcloud-server-9a0d7c5be4720ae68048b9bef20928f954abcf61.zip | |
Merge pull request #7014 from owncloud/fix_ocs_share_api
remove needless element tag from the ocs share api
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/lib/api.php | 3 |
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); } } |