From 508636082ecc68f61e82770bb671932be2b353bc Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 10 Mar 2011 20:46:27 -0800 Subject: [PATCH] bogus 'no results' message on search page --- boot.php | 2 +- index.php | 2 +- mod/search.php | 9 +-------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/boot.php b/boot.php index 4c3a923dce..1412f1f912 100644 --- a/boot.php +++ b/boot.php @@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.913' ); +define ( 'FRIENDIKA_VERSION', '2.1.914' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'DB_UPDATE_VERSION', 1040 ); diff --git a/index.php b/index.php index 09a179c1c2..cc17119b62 100644 --- a/index.php +++ b/index.php @@ -160,7 +160,7 @@ if(strlen($a->module)) { */ if((! $a->module_loaded) && (file_exists("mod/{$a->module}.php"))) { - include("mod/{$a->module}.php"); + include_once("mod/{$a->module}.php"); $a->module_loaded = true; } diff --git a/mod/search.php b/mod/search.php index 561bb6c620..db7279fb56 100644 --- a/mod/search.php +++ b/mod/search.php @@ -51,7 +51,7 @@ function search_content(&$a) { $a->set_pager_total($r[0]['total']); if(! $r[0]['total']) { - notice('No results.'); + notice( t('No results.') . EOL); return $o; } @@ -134,13 +134,6 @@ function search_content(&$a) { } } - - if(! $r[0]['total']) { - notice('No results.'); - return $o; - } - - $o .= paginate($a); return $o;