[Pkg-owncloud-commits] [owncloud] 21/74: make sure that we only find the shares from the correct share type if users and groups with the same ID exists

[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 fcde4c70a26c0149ca1c62958bae11e2cbec35ee
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Mon Nov 17 18:05:12 2014 +0100

    make sure that we only find the shares from the correct share type if users and groups with the same ID exists
---
 lib/private/share/share.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index c5f3bf6..07c2641 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -288,9 +288,10 @@ class Share extends \OC\Share\Constants {
 	 * @param string $itemType
 	 * @param string $itemSource
 	 * @param string $user User user to whom the item was shared
+	 * @param int $shareType only look for a specific share type
 	 * @return array Return list of items with file_target, permissions and expiration
 	 */
-	public static function getItemSharedWithUser($itemType, $itemSource, $user) {
+	public static function getItemSharedWithUser($itemType, $itemSource, $user, $shareType = null) {
 
 		$shares = array();
 		$fileDependend = false;
@@ -314,6 +315,11 @@ class Share extends \OC\Share\Constants {
 			$arguments[] = $user;
 		}
 
+		if ($shareType !== null) {
+			$where .= ' AND `share_type` = ? ';
+			$arguments[] = $shareType;
+		}
+
 		$query = \OC_DB::prepare('SELECT ' . $select . ' FROM `*PREFIX*share` '. $where);
 
 		$result = \OC_DB::executeAudited($query, $arguments);
@@ -695,7 +701,7 @@ class Share extends \OC\Share\Constants {
 		// check if it is a valid itemType
 		self::getBackend($itemType);
 
-		$items = self::getItemSharedWithUser($itemType, $itemSource, $shareWith);
+		$items = self::getItemSharedWithUser($itemType, $itemSource, $shareWith, $shareType);
 
 		$toDelete = array();
 		$newParent = null;

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