From 2353e6d23f54902d3b2b9e3fd46f1baa6e803450 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 30 Sep 2013 19:28:59 -0700 Subject: [PATCH] small fixes --- mod/dirsearch.php | 11 ++++++++++- mod/sources.php | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/mod/dirsearch.php b/mod/dirsearch.php index bb068a431..14307f274 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -45,7 +45,16 @@ function dirsearch_content(&$a) { // by default use a safe search $safe = ((x($_REQUEST,'safe')) ? intval($_REQUEST['safe']) : 1 ); - $sync = ((x($_REQUEST,'sync')) ? datetime_convert('UTC','UTC',$_REQUEST['sync']) : ''); + + if(array_key_exists('sync',$_REQUEST)) { + if($_REQUEST['sync']) + $sync = datetime_convert('UTC','UTC',$_REQUEST['sync']); + else + $sync = datetime_convert('UTC','UTC','2010-01-01 01:01:00'); + } + else + $sync = false; + $sort_order = ((x($_REQUEST,'order')) ? $_REQUEST['order'] : ''); // TODO - a meta search which joins all of these things to one search string diff --git a/mod/sources.php b/mod/sources.php index 200a0cddf..125184d47 100644 --- a/mod/sources.php +++ b/mod/sources.php @@ -60,7 +60,7 @@ function sources_content(&$a) { ); if($r) { for($x = 0; $x < count($r); $x ++) { - $r[$x]['src_patt'] = htmlspecialchars($r[$x]['src_patt']); + $r[$x]['src_patt'] = htmlspecialchars($r[$x]['src_patt'], ENT_COMPAT,'UTF-8'); } } $o = replace_macros(get_markup_template('sources_list.tpl'), array( @@ -97,7 +97,7 @@ function sources_content(&$a) { return ''; } - $r[0]['src_patt'] = htmlspecialchars($r[0]['src_patt']); + $r[0]['src_patt'] = htmlspecialchars($r[0]['src_patt'], ENT_QUOTES,'UTF-8'); $o = replace_macros(get_markup_template('sources_edit.tpl'), array( '$title' => t('Edit Source'),