aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2014-07-04 18:28:54 +0200
committerJörn Friedrich Dreyer <jfd@butonic.de>2014-07-04 18:28:54 +0200
commit8fbcca129102341cb957e18ab69f75f984fb43d1 (patch)
tree4b9f4c853f181a9c80270b0daddb4318d2e8787e
parentc7e08745a7f8b2b7256e0173db6b4f8cb88a4d3c (diff)
parentb56f5f27739112644420a82e5b3621c622e73917 (diff)
downloadnextcloud-server-8fbcca129102341cb957e18ab69f75f984fb43d1.tar.gz
nextcloud-server-8fbcca129102341cb957e18ab69f75f984fb43d1.zip
Merge pull request #9419 from owncloud/fix_search_results_in_root_dir
Fix search results in root dir & deprecate OC_Search_Provider
-rw-r--r--lib/private/legacy/search/provider.php4
-rw-r--r--search/js/result.js3
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/private/legacy/search/provider.php b/lib/private/legacy/search/provider.php
index d200c988c45..b296aeb23d8 100644
--- a/lib/private/legacy/search/provider.php
+++ b/lib/private/legacy/search/provider.php
@@ -17,6 +17,10 @@
*
*/
+/**
+ * Class OC_Search_Provider
+ * @deprecated use \OCP\Search\Provider instead
+ */
abstract class OC_Search_Provider extends \OCP\Search\Provider {
}
diff --git a/search/js/result.js b/search/js/result.js
index 04e999c62ee..857b4fe1f22 100644
--- a/search/js/result.js
+++ b/search/js/result.js
@@ -72,6 +72,9 @@ OC.search.showResults=function(results){
if (type[i].path) {
var parent = OC.dirname(type[i].path);
+ if (parent === '') {
+ parent = '/';
+ }
var containerName = OC.basename(parent);
if (containerName === '') {
containerName = '/';