Resolves MDL-13992, MDL-14328

This commit is contained in:
diml
2008-04-15 21:11:29 +00:00
parent 063970335d
commit 2a8167fcc1
3 changed files with 14 additions and 4 deletions
+2 -1
View File
@@ -50,7 +50,8 @@ require_once("$CFG->dirroot/search/lib.php");
$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);
+2 -1
View File
@@ -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 {
+10 -2
View File
@@ -45,8 +45,16 @@ require_once("{$CFG->dirroot}/search/lib.php");
$strsearch = get_string('search', 'search');
$strquery = get_string('statistics', 'search');
print_header("$site->shortname: $strsearch: $strquery", "$site->fullname",
"<a href=\"index.php\">$strsearch</a> -> $strquery");
if (!function_exists('build_navigation')){
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