[Pkg-owncloud-commits] [owncloud] 07/58: 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 annotated tag v8.0.6
in repository owncloud.

commit 4cbf10f392bcc31d8b24ebb0d3685dd2d6a992ea
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 e1eabc6..792b772 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -2071,7 +2071,9 @@ class Share extends \OC\Share\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