From ecde48fce8b0cc580161da539b44899c406cd10d Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 3 Mar 2014 17:27:26 +0100
Subject: [PATCH] don't assign variables in if conditions
---
lib/private/share/share.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 48dd3cd68e..69d93797ba 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -923,7 +923,8 @@ class Share extends \OC\Share\Constants {
} else {
$fileDependent = false;
$root = '';
- if ($includeCollections && !isset($item) && ($collectionTypes = self::getCollectionItemTypes($itemType))) {
+ $collectionTypes = self::getCollectionItemTypes($itemType);
+ if ($includeCollections && !isset($item) && $collectionTypes) {
// If includeCollections is true, find collections of this item type, e.g. a music album contains songs
if (!in_array($itemType, $collectionTypes)) {
$itemTypes = array_merge(array($itemType), $collectionTypes);
@@ -986,7 +987,8 @@ class Share extends \OC\Share\Constants {
}
}
if (isset($item)) {
- if ($includeCollections && $collectionTypes = self::getCollectionItemTypes($itemType)) {
+ $collectionTypes = self::getCollectionItemTypes($itemType);
+ if ($includeCollections && $collectionTypes) {
$where .= ' AND (';
} else {
$where .= ' AND';
--
GitLab