bogus 'no results' message on search page

diff --git a/boot.php b/boot.php
index 4c3a923dcea2e52644dea55e826aface43047192..1412f1f91228e3fbaa6f74bfdf2c9e9f2fc5943a 100644 (file)
--- 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 09a179c1c23ac9d833e3804a4cb1dd657462dc86..cc17119b62c6c48f92e5b6dc57b483595261d7cf 100644 (file)
--- 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 561bb6c620e58a4f026b164e0552a125bfe5e95b..db7279fb5609987846fdf34656cf8328deeb15cf 100644 (file)
--- 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;