harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'patch-20181113b' into 'dev'

Browse Source 
Patch 20181113b

See merge request hubzilla/core!1395
This commit is contained in:
Mario 2018-11-14 09:30:54 +01:00
commit 6ed9443972
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Module/Search.php
View File

@ -227,9 +227,9 @@ class Search extends \Zotlabs\Web\Controller {
} }
if($tag) 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 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'); $o .= conversation($items,'search',$update,'client');

2
include/text.php
View File

@ -1075,7 +1075,7 @@ function micropro($contact, $redirect = false, $class = '', $mode = false) {
function search($s,$id='search-box',$url='/search',$save = false) { function search($s,$id='search-box',$url='/search',$save = false) {
return replace_macros(get_markup_template('searchbox.tpl'),array( return replace_macros(get_markup_template('searchbox.tpl'),array(
'$s' => htmlspecialchars($s), '$s' => $s,
'$id' => $id, '$id' => $id,
'$action_url' => z_root() . $url, '$action_url' => z_root() . $url,
'$search_label' => t('Search'), '$search_label' => t('Search'),