diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-08-17 21:29:20 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-08-17 21:29:20 +0000 |
| commit | 8257d1c82809165608b33268a561b53fd78675a4 (patch) | |
| tree | f9bafd9ffb0366754f10c43752e8e5173f26342e /phpBB/includes | |
| parent | 6b75e8ffcb805c9b7827ed4ecd70fbccf012a27b (diff) | |
| download | forums-8257d1c82809165608b33268a561b53fd78675a4.tar forums-8257d1c82809165608b33268a561b53fd78675a4.tar.gz forums-8257d1c82809165608b33268a561b53fd78675a4.tar.bz2 forums-8257d1c82809165608b33268a561b53fd78675a4.tar.xz forums-8257d1c82809165608b33268a561b53fd78675a4.zip | |
ok, the nasty one then... :/
git-svn-id: file:///svn/phpbb/trunk@8044 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_template.php | 10 | ||||
| -rw-r--r-- | phpBB/includes/template.php | 8 |
2 files changed, 13 insertions, 5 deletions
diff --git a/phpBB/includes/functions_template.php b/phpBB/includes/functions_template.php index ba3b1ab106..0d8a39eaee 100644 --- a/phpBB/includes/functions_template.php +++ b/phpBB/includes/functions_template.php @@ -627,11 +627,11 @@ class template_compile { $expr_end++; $expr_arg = $tokens[$expr_end++]; - $expr = "!(isset($is_arg) && ($is_arg / $expr_arg) % $expr_arg)"; + $expr = "!(($is_arg / $expr_arg) % $expr_arg)"; } else { - $expr = "!(isset($is_arg) && $is_arg & 1)"; + $expr = "!($is_arg & 1)"; } break; @@ -640,11 +640,11 @@ class template_compile { $expr_end++; $expr_arg = $tokens[$expr_end++]; - $expr = "(isset($is_arg) && ($is_arg / $expr_arg) % $expr_arg)"; + $expr = "(($is_arg / $expr_arg) % $expr_arg)"; } else { - $expr = "(isset($is_arg) && $is_arg & 1)"; + $expr = "($is_arg & 1)"; } break; @@ -653,7 +653,7 @@ class template_compile { $expr_end++; $expr_arg = $tokens[$expr_end++]; - $expr = "!(isset($is_arg) && $is_arg % $expr_arg)"; + $expr = "!($is_arg % $expr_arg)"; } break; } diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php index f8db087d48..b13dbaa99a 100644 --- a/phpBB/includes/template.php +++ b/phpBB/includes/template.php @@ -149,6 +149,14 @@ class template { global $user; + if (defined('IN_ERROR_HANDLER')) + { + if ((E_NOTICE & error_reporting()) == E_NOTICE) + { + error_reporting(error_reporting() ^ E_NOTICE); + } + } + if ($filename = $this->_tpl_load($handle)) { ($include_once) ? include_once($filename) : include($filename); |