From ae6b2b7e89117bd4f3a3ea8a5f7e9eb7f3919100 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 10 Jun 2003 20:48:19 +0000 Subject: [PATCH] hrm, different storage of config value and user timezone value. ;) git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@4113 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/admin/page_header_admin.php | 2 +- phpBB/includes/page_header.php | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/phpBB/admin/page_header_admin.php b/phpBB/admin/page_header_admin.php index 9c9a06e156..3195f461a2 100644 --- a/phpBB/admin/page_header_admin.php +++ b/phpBB/admin/page_header_admin.php @@ -66,7 +66,7 @@ $template->set_filenames(array( // Format Timezone. We are unable to use array_pop here, because of PHP3 compatibility $l_timezone = explode('.', $board_config['board_timezone']); -$l_timezone = ($l_timezone[count($l_timezone)-1] != 0) ? $lang[sprintf('%.1f', $board_config['board_timezone'])] : $lang[number_format($board_config['board_timezone'])]; +$l_timezone = (count($l_timezone) > 1 && $l_timezone[count($l_timezone)-1] != 0) ? $lang[sprintf('%.1f', $board_config['board_timezone'])] : $lang[number_format($board_config['board_timezone'])]; // // The following assigns all _common_ variables that may be used at any point diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php index ec89542906..1eb9050e38 100644 --- a/phpBB/includes/page_header.php +++ b/phpBB/includes/page_header.php @@ -337,8 +337,7 @@ while( list($nav_item, $nav_array) = @each($nav_links) ) // Format Timezone. We are unable to use array_pop here, because of PHP3 compatibility $l_timezone = explode('.', $board_config['board_timezone']); -$l_timezone = ($l_timezone[count($l_timezone)-1] != 0) ? $lang[sprintf('%.1f', $board_config['board_timezone'])] : $lang[number_format($board_config['board_timezone'])]; - +$l_timezone = (count($l_timezone) > 1 && $l_timezone[count($l_timezone)-1] != 0) ? $lang[sprintf('%.1f', $board_config['board_timezone'])] : $lang[number_format($board_config['board_timezone'])]; // // The following assigns all _common_ variables that may be used at any point // in a template.