Merge branch 'master' into zvi

2018-11-14 16:42:03 -08:00
parent bf013ecf00 62b367fa81
commit b64dd7ab57
6 changed files with 33 additions and 33 deletions
--- a/include/text.php
+++ b/include/text.php
@@ -1061,7 +1061,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'),