aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2003-02-05 15:55:55 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2003-02-05 15:55:55 +0000
commita6bf34acf644dfdb53e8dbf34ebdcb3d94b97ace (patch)
tree0eb19dbb98ac9811112d31dc17bf71b99086f42f
parent65f8828fbbe89dc67b85dc076e87c2a0f35313bf (diff)
downloadforums-a6bf34acf644dfdb53e8dbf34ebdcb3d94b97ace.tar
forums-a6bf34acf644dfdb53e8dbf34ebdcb3d94b97ace.tar.gz
forums-a6bf34acf644dfdb53e8dbf34ebdcb3d94b97ace.tar.bz2
forums-a6bf34acf644dfdb53e8dbf34ebdcb3d94b97ace.tar.xz
forums-a6bf34acf644dfdb53e8dbf34ebdcb3d94b97ace.zip
Timezone issue ... perhaps this field should become a var/char ...
git-svn-id: file:///svn/phpbb/trunk@3454 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/page_header.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php
index a4806eaf4d..24cda764e7 100644
--- a/phpBB/includes/page_header.php
+++ b/phpBB/includes/page_header.php
@@ -260,6 +260,9 @@ foreach ($nav_links as $nav_item => $nav_array)
}
*/
+// Which timezone?
+$tz = ($user->data['user_id'] != ANONYMOUS) ? strval(doubleval($user->data['user_timezone'])) : strval(doubleval($config['board_timezone']));
+
// The following assigns all _common_ variables that may be used at any point
// in a template.
$template->assign_vars(array(
@@ -311,7 +314,7 @@ $template->assign_vars(array(
'S_CONTENT_DIR_LEFT' => $user->lang['LEFT'],
'S_CONTENT_DIR_RIGHT' => $user->lang['RIGHT'],
'S_LOGIN_ACTION' => 'login.'.$phpEx.$SID,
- 'S_TIMEZONE' => ($user->data['user_dst']) ? sprintf($user->lang['All_times'], $user->lang[doubleval($config['board_timezone'])], $user->lang['tz']['dst']) : sprintf($user->lang['All_times'], $user->lang[doubleval($config['board_timezone'])], ''),
+ 'S_TIMEZONE' => ($user->data['user_dst']) ? sprintf($user->lang['All_times'], $user->lang[$tz], $user->lang['tz']['dst']) : sprintf($user->lang['All_times'], $user->lang[$tz], ''),
'T_STYLESHEET_DATA' => $user->theme['css_data'],
'T_STYLESHEET_LINK' => 'templates/' . $user->theme['css_external'],