summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2017-03-15 15:05:15 +0100
committerGitHub <noreply@github.com>2017-03-15 15:05:15 +0100
commit5ed45fc8e60bd9f63398d2bbe25bf63b26b2010e (patch)
tree219ca2d7e06c6bdc362899d026012af0e1f4853b
parent5a998da206daa04dce39519a67d2a13637f874e2 (diff)
parent0fe45966a0bc1ef4d1c668b82d6aa06c7be300fe (diff)
downloadnextcloud-server-5ed45fc8e60bd9f63398d2bbe25bf63b26b2010e.tar.gz
nextcloud-server-5ed45fc8e60bd9f63398d2bbe25bf63b26b2010e.zip
Merge pull request #3848 from nextcloud/remove-single-quotes-around-search-query
Remove single quotes around search query like in user search
-rw-r--r--apps/files/js/filelist.js2
-rw-r--r--core/search/js/search.js6
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 1f4b8f0ec68..1385fe26771 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -2553,7 +2553,7 @@
$('#searchresults').addClass('filter-empty');
$('#searchresults .emptycontent').addClass('emptycontent-search');
if ( $('#searchresults').length === 0 || $('#searchresults').hasClass('hidden') ) {
- var error = t('files', "No search results in other folders for '{tag}{filter}{endtag}'", {filter:this._filter}, null, {'escape': false});
+ var error = t('files', 'No search results in other folders for {tag}{filter}{endtag}', {filter:this._filter});
this.$el.find('.nofilterresults').removeClass('hidden').
find('p').html(error.replace('{tag}', '<strong>').replace('{endtag}', '</strong>'));
}
diff --git a/core/search/js/search.js b/core/search/js/search.js
index 44a69842374..b4175c49a3e 100644
--- a/core/search/js/search.js
+++ b/core/search/js/search.js
@@ -216,9 +216,9 @@
if (count === 0) {
$status.addClass('emptycontent').removeClass('status');
$status.html('');
- $status.append('<div class="icon-search"></div>');
- var error = t('core', "No search results in other folders for '{tag}{filter}{endtag}'", {filter:lastQuery});
- $status.append('<h2>' + error.replace('{tag}', '<strong>').replace('{endtag}', '</strong>') + '</h2>');
+ $status.append($('<div>').addClass('icon-search'));
+ var error = t('core', 'No search results in other folders for {tag}{filter}{endtag}', {filter:lastQuery});
+ $status.append($('<h2>').html(error.replace('{tag}', '<strong>').replace('{endtag}', '</strong>')));
} else {
$status.removeClass('emptycontent').addClass('status');
$status.text(n('core', '{count} search result in another folder', '{count} search results in other folders', count, {count:count}));