Merge pull request #7014 from owncloud/fix_ocs_share_api

remove needless element tag from the ocs share api
13 years ago · 9a0d7c5be4
parent c0aeaf9ec0 f9d9a62e58
commit 9a0d7c5be4
1 changed files with 1 additions and 2 deletions
--- 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);
 			}
 		}