aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-06-04 19:06:46 +0200
committerJoas Schilling <nickvergessen@gmx.de>2012-06-18 15:07:12 +0200
commit50936cb2eff3f80d99390c76ef6ac535e73f6cc3 (patch)
tree7b2aee8eba0a921d19f0bf1fdd319914d0292efa /phpBB/includes/ucp
parent8f027b68d64c1baa99b272d45f382c17310f1480 (diff)
downloadforums-50936cb2eff3f80d99390c76ef6ac535e73f6cc3.tar
forums-50936cb2eff3f80d99390c76ef6ac535e73f6cc3.tar.gz
forums-50936cb2eff3f80d99390c76ef6ac535e73f6cc3.tar.bz2
forums-50936cb2eff3f80d99390c76ef6ac535e73f6cc3.tar.xz
forums-50936cb2eff3f80d99390c76ef6ac535e73f6cc3.zip
[feature/new-tz-handling] Fix selecting and validating of timezone in UCP
PHPBB3-9558
Diffstat (limited to 'phpBB/includes/ucp')
-rw-r--r--phpBB/includes/ucp/ucp_prefs.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 0c9f20f266..45e3bb8951 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -41,7 +41,7 @@ class ucp_prefs
'dateformat' => request_var('dateformat', $user->data['user_dateformat'], true),
'lang' => basename(request_var('lang', $user->data['user_lang'])),
'style' => request_var('style', (int) $user->data['user_style']),
- 'tz' => request_var('tz', (float) $user->data['user_timezone']),
+ 'tz' => request_var('tz', $user->data['user_timezone']),
'dst' => request_var('dst', (bool) $user->data['user_dst']),
'viewemail' => request_var('viewemail', (bool) $user->data['user_allow_viewemail']),
@@ -72,7 +72,7 @@ class ucp_prefs
$error = validate_data($data, array(
'dateformat' => array('string', false, 1, 30),
'lang' => array('language_iso_name'),
- 'tz' => array('num', false, -14, 14),
+ 'tz' => array('timezone'),
));
if (!check_form_key('ucp_prefs_personal'))