Changeset:
761d6587d67e
https://sourceforge.net/p/mrbs/hg-code/ci/761d6587d67e15b3448e591f1afe8e2ab90a69bc
Author:
Campbell Morrison <[email protected]>
Date:
Thu Oct 06 16:08:47 2016 +0100
Log message:
Fixed error in upgrade process
diffstat:
web/Themes/default/header.inc | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diffs (17 lines):
diff -r 76e387dbcc2d -r 761d6587d67e web/Themes/default/header.inc
--- a/web/Themes/default/header.inc Thu Oct 06 15:59:38 2016 +0100
+++ b/web/Themes/default/header.inc Thu Oct 06 16:08:47 2016 +0100
@@ -212,8 +212,11 @@
{
global $search_str, $locale_warning;
- // Need to set the timezone before we can use date()
- get_area_settings($area);
+ if (!$simple)
+ {
+ // This makes a database query, so don't do it if we want a simple header
+ get_area_settings($area);
+ }
// If we dont know the right date then make it up
if (!$day)
------------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
