diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-04-24 21:22:43 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-04-24 21:22:43 -0400 |
| commit | 5c3ebb3465eee36f9147a517d4f50f4032cd04d5 (patch) | |
| tree | 1bf6018c0583e8032cf7a95d35e602aa52f49c4e | |
| parent | a2c75f60537ccf6a424c7f066eafbffc13c0c38d (diff) | |
| download | forums-5c3ebb3465eee36f9147a517d4f50f4032cd04d5.tar forums-5c3ebb3465eee36f9147a517d4f50f4032cd04d5.tar.gz forums-5c3ebb3465eee36f9147a517d4f50f4032cd04d5.tar.bz2 forums-5c3ebb3465eee36f9147a517d4f50f4032cd04d5.tar.xz forums-5c3ebb3465eee36f9147a517d4f50f4032cd04d5.zip | |
[feature/template-engine] Deleted silencing of notices.
The code is now supposed to be notice-free, therefore there is no need
to have the notices silenced.
PHPBB3-9726
| -rw-r--r-- | phpBB/includes/template.php | 2 | ||||
| -rw-r--r-- | tests/template/template_test.php | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php index e1e96791c9..109f7a29ee 100644 --- a/phpBB/includes/template.php +++ b/phpBB/includes/template.php @@ -260,6 +260,7 @@ class phpbb_template } } + /* if (defined('IN_ERROR_HANDLER')) { if ((E_NOTICE & error_reporting()) == E_NOTICE) @@ -267,6 +268,7 @@ class phpbb_template error_reporting(error_reporting() ^ E_NOTICE); } } + */ $_tpldata = &$this->_tpldata; $_rootref = &$this->_rootref; diff --git a/tests/template/template_test.php b/tests/template/template_test.php index e549c9a0c8..b81a2a6152 100644 --- a/tests/template/template_test.php +++ b/tests/template/template_test.php @@ -381,14 +381,14 @@ class phpbb_template_template_test extends phpbb_test_case $this->template->destroy_block_vars($block); } - $error_level = error_reporting(); - error_reporting($error_level & ~E_NOTICE); + //$error_level = error_reporting(); + //error_reporting($error_level & ~E_NOTICE); $this->assertEquals($expected, self::trim_template_result($this->template->assign_display('test')), "Testing assign_display($file)"); $this->template->assign_display('test', 'VARIABLE', false); - error_reporting($error_level); + //error_reporting($error_level); $this->assertEquals($expected, $this->display('container'), "Testing assign_display($file)"); } |