[Pkg-owncloud-commits] [owncloud] 168/258: only create a new share entry, if the user needs a different target name than the group share

[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 1e5c786392c9f5098a328ee0294ec3dd526308ed
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Fri Sep 26 13:19:15 2014 +0200

    only create a new share entry, if the user needs a different target name than the group share
---
 lib/private/share/share.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index efd8a22..bb0217c 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -1703,7 +1703,7 @@ class Share extends \OC\Share\Constants {
 					$fileTarget = null;
 				}
 
-				if ($itemTarget === $groupItemTarget) {
+				if ($itemTarget === $groupItemTarget && (isset($fileSource) && $fileTarget === $groupItemTarget)) {
 					continue;
 				}
 			}

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