From 3e3038cafc727649293d5eaf55ec21d84391ff24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 2 Oct 2012 13:09:34 +0200
Subject: [PATCH] merge all possible conflicts into on array

---
 lib/public/share.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 8b3e5581d7..61b1a571d8 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -1002,22 +1002,21 @@ class Share {
 					}
 				}
 				// Check if target already exists
-				$targetConflict = false;
-				
+				$checkTarget = array();
 				if( $itemType == "file" or $itemType == "folder") {
 					$itemList1 = self::getItems("file", $target, $shareType, $shareWith);
 					$itemList2 = self::getItems("folder", $target, $shareType, $shareWith);
-					if ( !empty($itemList1) or !empty($itemList2)) {
-						$targetConflict = true;						
-					} 
-				} else {
-					$itemList = self::getItems($itemType, $target, $shareType, $shareWith);
-					if ( !empty($itemList) ) {
-						$targetConflict = true;
+					if ( !empty($itemList1) ) {
+						$checkTarget = array_merge($checkTarget, $itemList1);
 					}
+					if ( !empty($itemList2) ) {
+						$checkTarget = array_merge($checkTarget, $itemList2);	
+					}
+				} else {
+					$checkTarget = self::getItems($itemType, $target, $shareType, $shareWith);
 				}	
 
-				if ($targetConflict) {
+				if ( !empty($checkTarget) ) {
 					foreach ($checkTarget as $item) {
 						// Skip item if it is the group parent row
 						if (isset($groupParent) && $item['id'] == $groupParent) {