diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-10 23:46:24 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-10 23:46:24 -0400 |
| commit | cc0e6e9912fea2ef7ada9d49c8cf9e4427cea5f1 (patch) | |
| tree | e3d793ced85a7654e03707da02e2c2e682b1e4e3 | |
| parent | 3f9e9b581b8aad15ccfa01128c0dac8fd648e6ac (diff) | |
| parent | 0d407f10d08d620116b7279d57b4ea2375aea394 (diff) | |
| download | forums-cc0e6e9912fea2ef7ada9d49c8cf9e4427cea5f1.tar forums-cc0e6e9912fea2ef7ada9d49c8cf9e4427cea5f1.tar.gz forums-cc0e6e9912fea2ef7ada9d49c8cf9e4427cea5f1.tar.bz2 forums-cc0e6e9912fea2ef7ada9d49c8cf9e4427cea5f1.tar.xz forums-cc0e6e9912fea2ef7ada9d49c8cf9e4427cea5f1.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10126] Use binary "and not" instead of binary "xor" in error_reporting.
| -rw-r--r-- | phpBB/common.php | 2 | ||||
| -rw-r--r-- | phpBB/download/file.php | 2 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 2 | ||||
| -rw-r--r-- | phpBB/install/index.php | 2 | ||||
| -rw-r--r-- | phpBB/style.php | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index ccd043ba70..f5fb46ae07 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -24,7 +24,7 @@ if (!defined('E_DEPRECATED')) { define('E_DEPRECATED', 8192); } -error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED); +error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED); /* * Remove variables created by register_globals from the global scope diff --git a/phpBB/download/file.php b/phpBB/download/file.php index d33a50c149..c26261a22d 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -35,7 +35,7 @@ if (isset($_GET['avatar'])) { define('E_DEPRECATED', 8192); } - error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED); + error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED); require($phpbb_root_path . 'config.' . $phpEx); diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 63d191806a..a31de12edc 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -34,7 +34,7 @@ if (!defined('E_DEPRECATED')) { define('E_DEPRECATED', 8192); } -//error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED); +//error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED); error_reporting(E_ALL); @set_time_limit(0); diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 3cbc8744dd..50a98a282b 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -23,7 +23,7 @@ if (!defined('E_DEPRECATED')) { define('E_DEPRECATED', 8192); } -error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED); +error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED); // @todo Review this test and see if we can find out what it is which prevents PHP 4.2.x from even displaying the page with requirements on it if (version_compare(PHP_VERSION, '4.3.3') < 0) diff --git a/phpBB/style.php b/phpBB/style.php index 9f8b77c1f5..11e6ce53f7 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -20,7 +20,7 @@ if (!defined('E_DEPRECATED')) { define('E_DEPRECATED', 8192); } -error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED); +error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED); require($phpbb_root_path . 'config.' . $phpEx); |