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

Merge remote-tracking branch 'p/task/php54-olympus' into develop-olympus

Browse source 
* p/task/php54-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:49:37 +01:00
commit e5205ba2f8
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/includes/startup.php
View file

@ -19,7 +19,23 @@ 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;
if (version_compare(PHP_VERSION, '5.4.0-dev', '>='))
{
// PHP 5.4 adds E_STRICT to E_ALL.
// Our utf8 normalizer triggers E_STRICT output on PHP 5.4.
// Unfortunately it cannot be made E_STRICT-clean while
// continuing to work on PHP 4.
// Therefore, in phpBB 3.0.x we disable E_STRICT on PHP 5.4+,
// while phpBB 3.1 will fix utf8 normalizer.
// E_STRICT is defined starting with PHP 5
if (!defined('E_STRICT'))
{
define('E_STRICT', 2048);
}
$level &= ~E_STRICT;
}
error_reporting($level);
/* /*
* Remove variables created by register_globals from the global scope * Remove variables created by register_globals from the global scope