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 branch 'develop-olympus' into develop

Browse source 
With 5efdbfa5e4 reverted.

* develop-olympus:
  [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
  [task/php54] Refactor error_reporting call slightly.
This commit is contained in:
Andreas Fischer 2012-03-22 10:51:03 +01:00
commit 21bd0ca31a
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/includes/startup.php
View file

@ -19,7 +19,8 @@ if (!defined('E_DEPRECATED'))
{ {
define('E_DEPRECATED', 8192); 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 * Remove variables created by register_globals from the global scope