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

Merge pull request #2812 from bantu/ticket/12826

Browse source 
[ticket/12826] Add root namespace indicator to exception catching.

* bantu/ticket/12826:
  [ticket/12826] Add optional root namespace indicator for consistency.
  [ticket/12826] Add mandatory root namespace indicator to exception catching.
This commit is contained in:
Joas Schilling 2014-08-07 16:24:41 +02:00
commit a2b6f4e166
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -925,7 +925,7 @@ class acp_board
{ {
$user->timezone = new DateTimeZone($config['board_timezone']); $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. // If the board timezone is invalid, we just use the users timezone.
} }

2
phpBB/includes/functions.php
View file

@ -1031,7 +1031,7 @@ function phpbb_get_timezone_identifiers($selected_timezone)
$validate_timezone = new DateTimeZone($selected_timezone); $validate_timezone = new DateTimeZone($selected_timezone);
$timezones[] = $selected_timezone; $timezones[] = $selected_timezone;
} }
catch (Exception $e) catch (\Exception $e)
{ {
} }
} }

4
phpBB/phpbb/cache/driver/file.php vendored
View file

@ -208,7 +208,7 @@ class file extends \phpbb\cache\driver\base
{ {
$iterator = new \DirectoryIterator($this->cache_dir); $iterator = new \DirectoryIterator($this->cache_dir);
} }
catch (Exception $e) catch (\Exception $e)
{ {
return; return;
} }
@ -259,7 +259,7 @@ class file extends \phpbb\cache\driver\base
{ {
$iterator = new \DirectoryIterator($dir); $iterator = new \DirectoryIterator($dir);
} }
catch (Exception $e) catch (\Exception $e)
{ {
return; return;
} }