diff --git a/inc/init.php b/inc/init.php index aa0219f433eab9c2f1bbfae4ae73bafdd5e9d414..2d194aa090d913eebb53df46d1f336614234d001 100644 --- a/inc/init.php +++ b/inc/init.php @@ -16,8 +16,12 @@ // define config path (packagers may want to change this to /etc/dokuwiki/) if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/'); - // set up error reporting to sane values - error_reporting(E_ALL ^ E_NOTICE); + // check for error reporting override or set error reporting to sane values + if (!defined('DOKU_E_LEVEL') && file_exists(DOKU_CONF.'report_e_all')) { + define('DOKU_E_LEVEL', E_ALL); + } + if (!defined('DOKU_E_LEVEL')) { error_reporting(E_ALL ^ E_NOTICE); } + else { error_reporting(DOKU_E_LEVEL); } //prepare config array() global $conf; diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 5f6bb55398e30dcb6392e25ea909c3e316ba3536..d7a9a1ef4acc4b5dff5a0848d435ab2123961b05 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -793,9 +793,9 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $feed->feed_url($url); //disable warning while fetching - $elvl = error_reporting(E_ERROR); + if (!defined('DOKU_E_LEVEL')) { $elvl = error_reporting(E_ERROR); } $rc = $feed->init(); - error_reporting($elvl); + if (!defined('DOKU_E_LEVEL')) { error_reporting($elvl); } //decide on start and end if($params['reverse']){