Fixes MDL-14325

moodle · Apr 17, 2008 · 504c188 · 504c188
1 parent 6c9af98
commit 504c188
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 26 deletions.
diff --git a/search/indexersplash.php b/search/indexersplash.php
@@ -50,7 +50,8 @@
         $navlinks[] = array('name' => $strsearch, 'link' => "index.php", 'type' => 'misc');
         $navlinks[] = array('name' => $strquery, 'link' => "stats.php", 'type' => 'misc');
         $navlinks[] = array('name' => get_string('runindexer','search'), 'link' => null, 'type' => 'misc');
-        if ($CFG->version <= 2007021541){ // 1.8 branch stable timestamp
+        // if ($CFG->version <= 2007021541){ // 1.8 branch stable timestamp NOT RELIABLE
+        if (!function_exists('build_navigation')){ // 1.8 branch stable timestamp
             $navigation = '';
         } else {
             $navigation = build_navigation($navlinks);

diff --git a/search/query.php b/search/query.php
@@ -144,7 +144,8 @@
     $strsearch = get_string('search', 'search');
     $strquery  = get_string('enteryoursearchquery', 'search');
 
-    if ($CFG->version < 2007032200){
+//    if ($CFG->version < 2007032200){ NOT RELIABLE
+    if (!function_exists('build_navigation')){
         print_header("$site->shortname: $strsearch: $strquery", "$site->fullname",
                "<a href=\"index.php\">$strsearch</a> -> $strquery");
     } else {

diff --git a/search/stats.php b/search/stats.php
@@ -1,26 +1,26 @@
 <?php
-    /** 
+/** 
-    * Global Search Engine for Moodle
+* Global Search Engine for Moodle
-    *
+*
-    * @package search
+* @package search
-    * @category core
+* @category core
-    * @subpackage search_engine
+* @subpackage search_engine
-    * @author Michael Champanis (mchampan) [cynnical@gmail.com], Valery Fremaux [valery.fremaux@club-internet.fr] > 1.8
+* @author Michael Champanis (mchampan) [cynnical@gmail.com], Valery Fremaux [valery.fremaux@club-internet.fr] > 1.8
-    * @date 2008/03/31
+* @date 2008/03/31
-    * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
-    *
+*
-    * Prints some basic statistics about the current index.
+* Prints some basic statistics about the current index.
-    * Does some diagnostics if you are logged in as an administrator.
+* Does some diagnostics if you are logged in as an administrator.
-    * 
+* 
-    */
+*/
-    
+
-    /**
+/**
-    * includes and requires
+* includes and requires
-    */
+*/
-    require_once('../config.php');
+require_once('../config.php');
-    require_once("{$CFG->dirroot}/search/lib.php");
+require_once("{$CFG->dirroot}/search/lib.php");
-    
+
-    /// checks global search is enabled
+/// checks global search is enabled
 
     if ($CFG->forcelogin) {
         require_login();
@@ -45,8 +45,16 @@
     $strsearch = get_string('search', 'search');
     $strquery  = get_string('statistics', 'search'); 
 
-    print_header("$site->shortname: $strsearch: $strquery", "$site->fullname",
+    if (!function_exists('build_navigation')){
-               "<a href=\"index.php\">$strsearch</a> -> $strquery");
+        print_header("$site->shortname: $strsearch: $strquery", "$site->fullname",
+                   "<a href=\"index.php\">$strsearch</a> -> $strquery");
+    } else {
+        $navlinks[] = array('name' => $strsearch, 'link' => "index.php", 'type' => 'misc');
+        $navlinks[] = array('name' => $strquery, 'link' => null, 'type' => 'misc');
+        $navigation = build_navigation($navlinks);
+        $site = get_site();
+        print_header("$strsearch", "$site->fullname" , $navigation, "", "", true, "&nbsp;", navmenu($site));
+    }
 
 /// keep things pretty, even if php5 isn't available