aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-06-04 22:40:09 +0200
committerJoas Schilling <nickvergessen@gmx.de>2012-06-18 15:08:23 +0200
commitf9bc8252641ec69983acfc6d392770934b7a37a4 (patch)
treec74594733ceaf7b083c37493137fb01d14d22462
parent66ae9ee2ea8b65ddb4c39b4bc9add8d2aca2e73d (diff)
downloadforums-f9bc8252641ec69983acfc6d392770934b7a37a4.tar
forums-f9bc8252641ec69983acfc6d392770934b7a37a4.tar.gz
forums-f9bc8252641ec69983acfc6d392770934b7a37a4.tar.bz2
forums-f9bc8252641ec69983acfc6d392770934b7a37a4.tar.xz
forums-f9bc8252641ec69983acfc6d392770934b7a37a4.zip
[feature/new-tz-handling] Fix timezone validation in ACP user section
PHPBB3-9558
-rw-r--r--phpBB/includes/acp/acp_users.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 17687b05c7..825bba514f 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1458,7 +1458,7 @@ class acp_users
$data = array(
'dateformat' => utf8_normalize_nfc(request_var('dateformat', $user_row['user_dateformat'], true)),
'lang' => basename(request_var('lang', $user_row['user_lang'])),
- 'tz' => request_var('tz', (float) $user_row['user_timezone']),
+ 'tz' => request_var('tz', $user_row['user_timezone']),
'style' => request_var('style', $user_row['user_style']),
'dst' => request_var('dst', $user_row['user_dst']),
'viewemail' => request_var('viewemail', $user_row['user_allow_viewemail']),
@@ -1495,7 +1495,7 @@ class acp_users
$error = validate_data($data, array(
'dateformat' => array('string', false, 1, 30),
'lang' => array('match', false, '#^[a-z_\-]{2,}$#i'),
- 'tz' => array('num', false, -14, 14),
+ 'tz' => array('timezone'),
'topic_sk' => array('string', false, 1, 1),
'topic_sd' => array('string', false, 1, 1),