[Pkg-owncloud-commits] [owncloud] 23/145: remove needless element tag

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 8ee368ddad976883e307f4d59bd839bab83e39b6
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Thu Jan 30 13:34:41 2014 +0100

    remove needless element tag
---
 apps/files_sharing/lib/api.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/files_sharing/lib/api.php b/apps/files_sharing/lib/api.php
index f828a4e..061e60a 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);
 			}
 		}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git