aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoromniError <omniError@github>2014-11-12 16:01:49 -0600
committeromniError <omniError@github>2014-11-13 20:55:10 -0600
commit0a4ffb7cf818c399f4956773ff7cb8e5b0243fa3 (patch)
tree986970876af8ea2ab91c4ea2e091394b7cfbbfd9
parent834a93f76c9b2efe9a4fa89200fe24f844df7479 (diff)
downloadforums-0a4ffb7cf818c399f4956773ff7cb8e5b0243fa3.tar
forums-0a4ffb7cf818c399f4956773ff7cb8e5b0243fa3.tar.gz
forums-0a4ffb7cf818c399f4956773ff7cb8e5b0243fa3.tar.bz2
forums-0a4ffb7cf818c399f4956773ff7cb8e5b0243fa3.tar.xz
forums-0a4ffb7cf818c399f4956773ff7cb8e5b0243fa3.zip
[ticket/13306] move error_reporting call
https://tracker.phpbb.com/browse/PHPBB3-13306 PHPBB3-13306
-rw-r--r--phpBB/phpbb/error_collector.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/phpbb/error_collector.php b/phpBB/phpbb/error_collector.php
index 688bc0c422..bf8efd1065 100644
--- a/phpBB/phpbb/error_collector.php
+++ b/phpBB/phpbb/error_collector.php
@@ -26,17 +26,18 @@ class error_collector
* the error_reporting() function will be used to determine which errors
* the collector will keep.
*
+ * @see PHPBB3-13306
* @param int|null $error_types
*/
function __construct($error_types = null)
{
$this->errors = array();
- $this->error_types = ($error_types !== null) ? $error_types : error_reporting();
+ $this->error_types = $error_types;
}
function install()
{
- set_error_handler(array(&$this, 'error_handler'), $this->error_types);
+ set_error_handler(array(&$this, 'error_handler'), ($this->error_types !== null) ? $this->error_types : error_reporting());
}
function uninstall()