aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2018-11-14 09:30:54 +0100
committerMario <mario@mariovavti.com>2018-11-14 09:30:54 +0100
commit6ed944397222a519bfa11947c6484a37dde0a40a (patch)
tree0eff1c6f018e75db201458372736a5708f766287
parent08e0f172ded6abcf8175d9f133d4aa2cf2ec2b4e (diff)
parentf1d168f781fc14e55b85b6e0a4e214d18f2ec969 (diff)
downloadvolse-hubzilla-6ed944397222a519bfa11947c6484a37dde0a40a.tar.gz
volse-hubzilla-6ed944397222a519bfa11947c6484a37dde0a40a.tar.bz2
volse-hubzilla-6ed944397222a519bfa11947c6484a37dde0a40a.zip
Merge branch 'patch-20181113b' into 'dev'
Patch 20181113b See merge request hubzilla/core!1395
-rw-r--r--Zotlabs/Module/Search.php4
-rw-r--r--include/text.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php
index 272bbdac1..838f9d6b9 100644
--- a/Zotlabs/Module/Search.php
+++ b/Zotlabs/Module/Search.php
@@ -227,9 +227,9 @@ class Search extends \Zotlabs\Web\Controller {
}
if($tag)
- $o .= '<h2>' . sprintf( t('Items tagged with: %s'),htmlspecialchars($search, ENT_COMPAT,'UTF-8')) . '</h2>';
+ $o .= '<h2>' . sprintf( t('Items tagged with: %s'),$search) . '</h2>';
else
- $o .= '<h2>' . sprintf( t('Search results for: %s'),htmlspecialchars($search, ENT_COMPAT,'UTF-8')) . '</h2>';
+ $o .= '<h2>' . sprintf( t('Search results for: %s'),$search) . '</h2>';
$o .= conversation($items,'search',$update,'client');
diff --git a/include/text.php b/include/text.php
index da18080dd..076c98407 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1075,7 +1075,7 @@ function micropro($contact, $redirect = false, $class = '', $mode = false) {
function search($s,$id='search-box',$url='/search',$save = false) {
return replace_macros(get_markup_template('searchbox.tpl'),array(
- '$s' => htmlspecialchars($s),
+ '$s' => $s,
'$id' => $id,
'$action_url' => z_root() . $url,
'$search_label' => t('Search'),