smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-04 02:14:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove debug output for cached and fetched cases.

Browse Source
This commit is contained in:
andrey
2001-06-20 18:38:00 +00:00
parent 52500237ef
commit 5cc313b04f
3 changed files with 8 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Smarty.addons.php
View File

@@ -615,7 +615,6 @@ function smarty_func_assign_debug_info($args, &$smarty_obj) {
$assigned_vars = $smarty_obj->_tpl_vars; $assigned_vars = $smarty_obj->_tpl_vars;
ksort($assigned_vars); ksort($assigned_vars);
$included_templates = $smarty_obj->_included_tpls; $included_templates = $smarty_obj->_included_tpls;
//sort($included_templates);
$smarty_obj->assign("_debug_keys",array_keys($assigned_vars)); $smarty_obj->assign("_debug_keys",array_keys($assigned_vars));
$smarty_obj->assign("_debug_vals",array_values($assigned_vars)); $smarty_obj->assign("_debug_vals",array_values($assigned_vars));
$smarty_obj->assign("_debug_tpls",$included_templates); $smarty_obj->assign("_debug_tpls",$included_templates);

22
Smarty.class.php
View File

@@ -518,16 +518,9 @@ class Smarty
$results = $this->_process_cached_inserts($results); $results = $this->_process_cached_inserts($results);
} }
if ($display) { if ($display) {
echo $results; echo $results; return;
if ($this->debugging) { echo $this->_generate_debug_output(); }
return;
} else { } else {
if ($this->debugging) { return $results;
$debug_output = $this->_generate_debug_output();
return $results.$debug_output;
} else {
return $results;
}
} }
} }
} }
@@ -588,16 +581,9 @@ class Smarty
if ($this->debugging) { echo $this->_generate_debug_output(); } if ($this->debugging) { echo $this->_generate_debug_output(); }
return; return;
} else { } else {
if (isset($results)) { if (isset($results)) { return $results; }
if ($this->debugging) {
$debug_output = $this->_generate_debug_output();
return $results.$debug_output;
} else {
return $results;
}
}
} }
} }
/*======================================================================*\ /*======================================================================*\
Function: _generate_debug_output() Function: _generate_debug_output()

22
libs/Smarty.class.php
View File

@@ -518,16 +518,9 @@ class Smarty
$results = $this->_process_cached_inserts($results); $results = $this->_process_cached_inserts($results);
} }
if ($display) { if ($display) {
echo $results; echo $results; return;
if ($this->debugging) { echo $this->_generate_debug_output(); }
return;
} else { } else {
if ($this->debugging) { return $results;
$debug_output = $this->_generate_debug_output();
return $results.$debug_output;
} else {
return $results;
}
} }
} }
} }
@@ -588,16 +581,9 @@ class Smarty
if ($this->debugging) { echo $this->_generate_debug_output(); } if ($this->debugging) { echo $this->_generate_debug_output(); }
return; return;
} else { } else {
if (isset($results)) { if (isset($results)) { return $results; }
if ($this->debugging) {
$debug_output = $this->_generate_debug_output();
return $results.$debug_output;
} else {
return $results;
}
}
} }
} }
/*======================================================================*\ /*======================================================================*\
Function: _generate_debug_output() Function: _generate_debug_output()