[Pkg-owncloud-commits] [owncloud] 21/122: Ignore "parent" shares when the sharee is the owner of the reshare-source

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit f524ae261ae53b7d3ea88f952ad29d72eb48dcb4
Author: Joas Schilling <nickvergessen at owncloud.com>
Date:   Wed Apr 29 14:18:46 2015 +0200

    Ignore "parent" shares when the sharee is the owner of the reshare-source
---
 lib/private/share/share.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index d1facc9..61d9b3b 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -2100,7 +2100,9 @@ class Share extends Constants {
 				\OC_Log::write('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OC_Log::ERROR);
 				throw new \Exception($message_t);
 			}
+		}
 
+		if ($checkReshare && $checkReshare['uid_owner'] !== \OC_User::getUser()) {
 			// Check if share permissions is granted
 			if (self::isResharingAllowed() && (int)$checkReshare['permissions'] & \OCP\Constants::PERMISSION_SHARE) {
 				if (~(int)$checkReshare['permissions'] & $permissions) {

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