diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-03-22 10:51:03 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-03-22 10:51:03 +0100 |
| commit | 21bd0ca31af133f0221a1f369b39a56a5c0485a6 (patch) | |
| tree | 4aa554ab2bae22b6493b9926fceb0b96318e71dc /phpBB/includes | |
| parent | cfd0afe4ead0c4910567d955088d4225d17d4186 (diff) | |
| parent | e5205ba2f85ac05567ddb92d8eab6ba002d76375 (diff) | |
| download | forums-21bd0ca31af133f0221a1f369b39a56a5c0485a6.tar forums-21bd0ca31af133f0221a1f369b39a56a5c0485a6.tar.gz forums-21bd0ca31af133f0221a1f369b39a56a5c0485a6.tar.bz2 forums-21bd0ca31af133f0221a1f369b39a56a5c0485a6.tar.xz forums-21bd0ca31af133f0221a1f369b39a56a5c0485a6.zip | |
Merge branch 'develop-olympus' into develop
With 5efdbfa5e4e3c00c08167cdfff912ee4937f4fd2 reverted.
* develop-olympus:
[task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
[task/php54] Refactor error_reporting call slightly.
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/startup.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/startup.php b/phpBB/includes/startup.php index 2100fbd97e..fc45cd882b 100644 --- a/phpBB/includes/startup.php +++ b/phpBB/includes/startup.php @@ -19,7 +19,8 @@ if (!defined('E_DEPRECATED')) { define('E_DEPRECATED', 8192); } -error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED); +$level = E_ALL & ~E_NOTICE & ~E_DEPRECATED; +error_reporting($level); /* * Remove variables created by register_globals from the global scope |