diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 16:24:48 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 16:24:48 +0200 |
| commit | 9925733350efe98007b08f88a36e9138908129d9 (patch) | |
| tree | 54fdc61731dd6b2e319c7b5b7c8c08271f0bb3e8 /phpBB/includes/acp | |
| parent | 9a0451889cf91c7e6563d8e12108630ee5d1f130 (diff) | |
| parent | a2b6f4e1665495f1dbabfa284f097a8cda122dcb (diff) | |
| download | forums-9925733350efe98007b08f88a36e9138908129d9.tar forums-9925733350efe98007b08f88a36e9138908129d9.tar.gz forums-9925733350efe98007b08f88a36e9138908129d9.tar.bz2 forums-9925733350efe98007b08f88a36e9138908129d9.tar.xz forums-9925733350efe98007b08f88a36e9138908129d9.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12826] Add optional root namespace indicator for consistency.
[ticket/12826] Add mandatory root namespace indicator to exception catching.
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 1811748c2f..f2707f15ca 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -925,7 +925,7 @@ class acp_board { $user->timezone = new DateTimeZone($config['board_timezone']); } - catch (Exception $e) + catch (\Exception $e) { // If the board timezone is invalid, we just use the users timezone. } |