[Pkg-owncloud-commits] [owncloud] 45/131: Make sure the owner always has the right path

[David Prévot]

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

taffit pushed a commit to annotated tag v8.1.1
in repository owncloud.

commit 8f2ce01553e6e8c9e43863dd4f993fca10e88d24
Author: Joas Schilling <nickvergessen at owncloud.com>
Date:   Tue Jul 7 11:08:21 2015 +0200

    Make sure the owner always has the right path
---
 lib/private/share/share.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 2dc83bd..2a9fa44 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -253,9 +253,6 @@ class Share extends Constants {
 		// Include owner in list of users, if requested
 		if ($includeOwner) {
 			$shares[] = $ownerUser;
-			if ($returnUserPaths) {
-				$sharePaths[$ownerUser] = $path;
-			}
 		}
 
 		if ($returnUserPaths) {
@@ -283,6 +280,12 @@ class Share extends Constants {
 				}
 			}
 
+			if ($includeOwner) {
+				$sharePaths[$ownerUser] = $path;
+			} else {
+				unset($sharePaths[$ownerUser]);
+			}
+
 			return $sharePaths;
 		}
 

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