makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/new-tz-handling] Fall back to UTC, if the timezone is invalid

Browse source 
This should avoid problems, when the board files are updated but database isn't.

PHPBB3-9558
This commit is contained in:
Joas Schilling 2012-07-19 15:46:12 +02:00
parent 6de222065e
commit 196e634370
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/includes/acp/acp_board.php
View file

@ -916,7 +916,14 @@ class acp_board
// Let the format_date function operate with the acp values
$old_tz = $user->timezone;
$user->timezone = new DateTimeZone($config['board_timezone']);
try
{
$user->timezone = new DateTimeZone($config['board_timezone']);
}
catch (Exception $e)
{
// If the board timezone is invalid, we just use the users timezone.
}
$dateformat_options = '';

10
phpBB/includes/user.php
View file

@ -127,7 +127,15 @@ class phpbb_user extends phpbb_session
*/
}
$this->timezone = new DateTimeZone($user_timezone);
try
{
$this->timezone = new DateTimeZone($user_timezone);
}
catch (Exception $e)
{
// If the timezone the user has selected is invalid, we fall back to UTC.
$this->timezone = new DateTimeZone('UTC');
}
// We include common language file here to not load it every time a custom language file is included
$lang = &$this->lang;