Changeset: 631561099f00 https://sourceforge.net/p/mrbs/hg-code/ci/631561099f0017554c259c3453e0007834d1cad8 Author: Campbell Morrison <cimorri...@hg.code.sf.net> Date: Sun Mar 05 15:29:04 2017 +0000 Log message:
Eliminated a global. diffstat: web/Themes/default/header.inc | 4 ++-- web/functions.inc | 4 ++-- web/search.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diffs (48 lines): diff -r 244739bbe907 -r 631561099f00 web/Themes/default/header.inc --- a/web/Themes/default/header.inc Sun Mar 05 15:19:07 2017 +0000 +++ b/web/Themes/default/header.inc Sun Mar 05 15:29:04 2017 +0000 @@ -205,9 +205,9 @@ // Print the page header // If $simple is true, then just print a simple header that doesn't require any database // access or JavaScript (useful for fatal errors and database upgrades). -function print_theme_header($day, $month, $year, $area, $room, $simple=false) +function print_theme_header($day, $month, $year, $area, $room, $simple=false, $search_str) { - global $search_str, $locale_warning; + global $locale_warning; // Need to set the timezone before we can use date() if ($simple) diff -r 244739bbe907 -r 631561099f00 web/functions.inc --- a/web/functions.inc Sun Mar 05 15:19:07 2017 +0000 +++ b/web/functions.inc Sun Mar 05 15:29:04 2017 +0000 @@ -175,7 +175,7 @@ // Print the page header -function print_header($day, $month, $year, $area, $room, $simple=false) +function print_header($day, $month, $year, $area, $room, $simple=false, $search_str='') { global $theme; @@ -198,7 +198,7 @@ } // Now go and do it - print_theme_header($day, $month, $year, $area, $room, $simple); + print_theme_header($day, $month, $year, $area, $room, $simple, $search_str); $done_header = true; } diff -r 244739bbe907 -r 631561099f00 web/search.php --- a/web/search.php Sun Mar 05 15:19:07 2017 +0000 +++ b/web/search.php Sun Mar 05 15:29:04 2017 +0000 @@ -146,7 +146,7 @@ if (!$ajax) { - print_header($day, $month, $year, $area, isset($room) ? $room : ""); + print_header($day, $month, $year, $area, isset($room) ? $room : "", false, $search_str); if (!empty($advanced)) { ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, SlashDot.org! http://sdm.link/slashdot _______________________________________________ Mrbs-commits mailing list Mrbs-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mrbs-commits