mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-24 20:17:58 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [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:48 +02:00
parent 9a0451889c a2b6f4e166
commit 9925733350
3 changed files with 4 additions and 4 deletions
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']);
}
catch (Exception $e)
catch (\Exception $e)
{
// 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);
$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);
}
catch (Exception $e)
catch (\Exception $e)
{
return;
}
@ -259,7 +259,7 @@ class file extends \phpbb\cache\driver\base
{
$iterator = new \DirectoryIterator($dir);
}
catch (Exception $e)
catch (\Exception $e)
{
return;
}