makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/template-engine] Deleted silencing of notices.

Browse source 
The code is now supposed to be notice-free, therefore there is no need
to have the notices silenced.

PHPBB3-9726
This commit is contained in:
Oleg Pudeyev 2011-04-24 21:22:43 -04:00
parent a2c75f6053
commit 5c3ebb3465
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/template.php
View file

@ -260,6 +260,7 @@ class phpbb_template
} }
} }
/*
if (defined('IN_ERROR_HANDLER')) if (defined('IN_ERROR_HANDLER'))
{ {
if ((E_NOTICE & error_reporting()) == E_NOTICE) if ((E_NOTICE & error_reporting()) == E_NOTICE)
@ -267,6 +268,7 @@ class phpbb_template
error_reporting(error_reporting() ^ E_NOTICE); error_reporting(error_reporting() ^ E_NOTICE);
} }
} }
*/
$_tpldata = &$this->_tpldata; $_tpldata = &$this->_tpldata;
$_rootref = &$this->_rootref; $_rootref = &$this->_rootref;

6
tests/template/template_test.php
View file

@ -381,14 +381,14 @@ class phpbb_template_template_test extends phpbb_test_case
$this->template->destroy_block_vars($block); $this->template->destroy_block_vars($block);
} }
$error_level = error_reporting(); //$error_level = error_reporting();
error_reporting($error_level & ~E_NOTICE); //error_reporting($error_level & ~E_NOTICE);
$this->assertEquals($expected, self::trim_template_result($this->template->assign_display('test')), "Testing assign_display($file)"); $this->assertEquals($expected, self::trim_template_result($this->template->assign_display('test')), "Testing assign_display($file)");
$this->template->assign_display('test', 'VARIABLE', false); $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)"); $this->assertEquals($expected, $this->display('container'), "Testing assign_display($file)");
} }