Only turn down error notices if $debugging is false.

This commit is contained in:
andrei
2002-04-15 16:39:16 +00:00
parent b3c7c91829
commit 13a81d8bdb
2 changed files with 10 additions and 10 deletions

View File

@@ -518,7 +518,7 @@ class Smarty
\*======================================================================*/ \*======================================================================*/
function fetch($_smarty_tpl_file, $_smarty_cache_id = null, $_smarty_compile_id = null, $_smarty_display = false) function fetch($_smarty_tpl_file, $_smarty_cache_id = null, $_smarty_compile_id = null, $_smarty_display = false)
{ {
$_smarty_old_error_level = error_reporting(error_reporting() & ~E_NOTICE); $_smarty_old_error_level = $this->debugging ? error_reporting() : error_reporting(error_reporting() & ~E_NOTICE);
if (!$this->debugging && $this->debugging_ctrl == 'URL' if (!$this->debugging && $this->debugging_ctrl == 'URL'
&& strstr($GLOBALS['QUERY_STRING'], $this->_smarty_debug_id)) { && strstr($GLOBALS['QUERY_STRING'], $this->_smarty_debug_id)) {
@@ -566,10 +566,10 @@ class Smarty
} }
} }
echo $_smarty_results; echo $_smarty_results;
error_reporting($_smarty_old_error_reporting); error_reporting($_smarty_old_error_level);
return true; return true;
} else { } else {
error_reporting($_smarty_old_error_reporting); error_reporting($_smarty_old_error_level);
return $_smarty_results; return $_smarty_results;
} }
} else { } else {
@@ -616,10 +616,10 @@ class Smarty
echo $this->_generate_debug_output(); echo $this->_generate_debug_output();
} }
error_reporting($_smarty_old_error_reporting); error_reporting($_smarty_old_error_level);
return; return;
} else { } else {
error_reporting($_smarty_old_error_reporting); error_reporting($_smarty_old_error_level);
if (isset($_smarty_results)) { return $_smarty_results; } if (isset($_smarty_results)) { return $_smarty_results; }
} }
} }

View File

@@ -518,7 +518,7 @@ class Smarty
\*======================================================================*/ \*======================================================================*/
function fetch($_smarty_tpl_file, $_smarty_cache_id = null, $_smarty_compile_id = null, $_smarty_display = false) function fetch($_smarty_tpl_file, $_smarty_cache_id = null, $_smarty_compile_id = null, $_smarty_display = false)
{ {
$_smarty_old_error_level = error_reporting(error_reporting() & ~E_NOTICE); $_smarty_old_error_level = $this->debugging ? error_reporting() : error_reporting(error_reporting() & ~E_NOTICE);
if (!$this->debugging && $this->debugging_ctrl == 'URL' if (!$this->debugging && $this->debugging_ctrl == 'URL'
&& strstr($GLOBALS['QUERY_STRING'], $this->_smarty_debug_id)) { && strstr($GLOBALS['QUERY_STRING'], $this->_smarty_debug_id)) {
@@ -566,10 +566,10 @@ class Smarty
} }
} }
echo $_smarty_results; echo $_smarty_results;
error_reporting($_smarty_old_error_reporting); error_reporting($_smarty_old_error_level);
return true; return true;
} else { } else {
error_reporting($_smarty_old_error_reporting); error_reporting($_smarty_old_error_level);
return $_smarty_results; return $_smarty_results;
} }
} else { } else {
@@ -616,10 +616,10 @@ class Smarty
echo $this->_generate_debug_output(); echo $this->_generate_debug_output();
} }
error_reporting($_smarty_old_error_reporting); error_reporting($_smarty_old_error_level);
return; return;
} else { } else {
error_reporting($_smarty_old_error_reporting); error_reporting($_smarty_old_error_level);
if (isset($_smarty_results)) { return $_smarty_results; } if (isset($_smarty_results)) { return $_smarty_results; }
} }
} }