mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source
This commit is contained in:
Joas Schilling
2015-01-09 18:39:26 +01:00
parent a5007b7abd d9bdd05c80
commit 1981f4f966
2 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
phpBB/phpbb/error_collector.php
View File

@@ -16,15 +16,28 @@ namespace phpbb;
class error_collector
{
var $errors;
var $error_types;
function __construct()
/**
* Constructor.
*
* The variable $error_types may be set to a mask of PHP error types that
* the collector should keep, e.g. `E_ALL`. If unset, the current value of
* 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;
}
function install()
{
set_error_handler(array(&$this, 'error_handler'));
set_error_handler(array(&$this, 'error_handler'), ($this->error_types !== null) ? $this->error_types : error_reporting());
}
function uninstall()