aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-07-19 14:36:20 +0200
committerJoas Schilling <nickvergessen@gmx.de>2012-07-19 14:36:20 +0200
commit6de222065e737bdab4ecdd010773fb70c415fb3b (patch)
tree4b70f21fbd3be39fbe435ede20ca63759ca7680b /phpBB/includes/functions_user.php
parentd099ef8cade0194fa8056439d489b159d5890f29 (diff)
downloadforums-6de222065e737bdab4ecdd010773fb70c415fb3b.tar
forums-6de222065e737bdab4ecdd010773fb70c415fb3b.tar.gz
forums-6de222065e737bdab4ecdd010773fb70c415fb3b.tar.bz2
forums-6de222065e737bdab4ecdd010773fb70c415fb3b.tar.xz
forums-6de222065e737bdab4ecdd010773fb70c415fb3b.zip
[feature/new-tz-handling] Add previous selected value to validation if valid
We also add the selected timezone if we can create an object with it. DateTimeZone::listIdentifiers seems to not add all identifiers to the list, because some are only kept for backward compatible reasons. If the user has a deprecated value, we add it here, so it can still be kept. Once the user changed his value, there is no way back to deprecated values. PHPBB3-9558
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r--phpBB/includes/functions_user.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 9bc72cbaa6..6e658b4ef4 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1420,7 +1420,7 @@ function validate_language_iso_name($lang_iso)
*/
function phpbb_validate_timezone($timezone)
{
- return (in_array($timezone, DateTimeZone::listIdentifiers())) ? false : 'TIMEZONE_INVALID';
+ return (in_array($timezone, phpbb_get_timezone_identifiers($timezone))) ? false : 'TIMEZONE_INVALID';
}
/**