[Pkg-owncloud-commits] [owncloud] 161/258: only add a new row if it isn't a unique share, otherwise update the existing row

[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 7edf912ef8a342c62d2e82e9cdc713ec14ba6f18
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Thu Sep 18 14:46:11 2014 +0200

    only add a new row if it isn't a unique share, otherwise update the existing row
---
 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 c16ef5a..6cfa7a7 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -771,7 +771,7 @@ class Share extends \OC\Share\Constants {
 			}
 		}
 
-		if (!$itemUnshared && isset($groupShare)) {
+		if (!$itemUnshared && isset($groupShare) && !isset($uniqueGroupShare)) {
 			$query = \OC_DB::prepare('INSERT INTO `*PREFIX*share`'
 					.' (`item_type`, `item_source`, `item_target`, `parent`, `share_type`,'
 					.' `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`, `file_target`)'

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