From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 13 May 2012 07:16:53 +0000 (+0200)
Subject: VCategories: Suppress error messages stemming from import from file app.
X-Git-Tag: v4.0.0RC2~102
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9e6221b229410599c28045d1956bb6e84d33cadc;p=nextcloud-server.git

VCategories: Suppress error messages stemming from import from file app.
---

diff --git a/lib/vcategories.php b/lib/vcategories.php
index b3b6a493c8d..7b3844bf689 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -96,7 +96,7 @@ class OC_VCategories {
 			}
 		}
 		if(count($newones) > 0) {
-			$this->categories = array_merge($this->categories, $newones);
+			$this->categories = @array_merge($this->categories, $newones);
 			if($sync === true) {
 				$this->save();
 			}
@@ -199,7 +199,7 @@ class OC_VCategories {
 
 	// case-insensitive in_array
 	private function in_arrayi($needle, $haystack) {
-		return in_array(strtolower($needle), array_map('strtolower', $haystack));
+		return in_array(strtolower($needle), @array_map('strtolower', $haystack));
 	}
 
 	// case-insensitive array_search