summaryrefslogtreecommitdiffstats
path: root/lib/vcategories.php
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2012-10-24 21:55:25 +0200
committerThomas Tanghus <thomas@tanghus.net>2012-10-24 21:55:25 +0200
commit675a56c5ed798afae6bc9e56616f948a2c4496c2 (patch)
tree53f8b9688d4ace289d8b5438e22fa3d857e3aa5b /lib/vcategories.php
parentbefdd6b63b1f64625bd26d50b18ebef5b8f82db4 (diff)
parent515e1b467e58337067ee3a4a8945f449d3c2ef3a (diff)
downloadnextcloud-server-675a56c5ed798afae6bc9e56616f948a2c4496c2.tar.gz
nextcloud-server-675a56c5ed798afae6bc9e56616f948a2c4496c2.zip
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts: lib/vcategories.php
Diffstat (limited to 'lib/vcategories.php')
-rw-r--r--lib/vcategories.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/vcategories.php b/lib/vcategories.php
index 607a995cb33..ec243297a43 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -706,11 +706,11 @@ class OC_VCategories {
if(!is_array($haystack)) {
return false;
}
+
return array_search(
strtolower($needle),
array_map('strtolower', $haystack)
);
}
-
}