From 5cc313b04f668b18ea463ec0c6e1287967b6293a Mon Sep 17 00:00:00 2001
From: andrey <andrey@localhost>
Date: Wed, 20 Jun 2001 18:38:00 +0000
Subject: [PATCH] Remove debug output for cached and fetched cases.

---
 Smarty.addons.php     |  1 -
 Smarty.class.php      | 22 ++++------------------
 libs/Smarty.class.php | 22 ++++------------------
 3 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/Smarty.addons.php b/Smarty.addons.php
index c17d551e..99e0e706 100644
--- a/Smarty.addons.php
+++ b/Smarty.addons.php
@@ -615,7 +615,6 @@ function smarty_func_assign_debug_info($args, &$smarty_obj) {
 	$assigned_vars = $smarty_obj->_tpl_vars;
 	ksort($assigned_vars);
 	$included_templates = $smarty_obj->_included_tpls;
-	//sort($included_templates);
 	$smarty_obj->assign("_debug_keys",array_keys($assigned_vars));
 	$smarty_obj->assign("_debug_vals",array_values($assigned_vars));
 	$smarty_obj->assign("_debug_tpls",$included_templates);
diff --git a/Smarty.class.php b/Smarty.class.php
index f7476712..7bac2a73 100644
--- a/Smarty.class.php
+++ b/Smarty.class.php
@@ -518,16 +518,9 @@ class Smarty
                     $results = $this->_process_cached_inserts($results);
                 }
                 if ($display) {
-                    echo $results;
-					if ($this->debugging) { echo $this->_generate_debug_output(); }
-                    return;
+                    echo $results; return;
                 } else {
-					if ($this->debugging) {
-						$debug_output = $this->_generate_debug_output();
-						return $results.$debug_output;
-					} else {
-                    	return $results;
-					}
+                    return $results;
                 }
             }
         }
@@ -588,16 +581,9 @@ class Smarty
 			if ($this->debugging) { echo $this->_generate_debug_output(); }
             return;
         } else {
-            if (isset($results)) {
-				if ($this->debugging) {
-					$debug_output = $this->_generate_debug_output();
-					return $results.$debug_output;
-				} else {
-					return $results;
-				}
-			}
+            if (isset($results)) { return $results; }
         }
-    }   
+    }
 
 /*======================================================================*\
 	Function:	_generate_debug_output()
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index f7476712..7bac2a73 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -518,16 +518,9 @@ class Smarty
                     $results = $this->_process_cached_inserts($results);
                 }
                 if ($display) {
-                    echo $results;
-					if ($this->debugging) { echo $this->_generate_debug_output(); }
-                    return;
+                    echo $results; return;
                 } else {
-					if ($this->debugging) {
-						$debug_output = $this->_generate_debug_output();
-						return $results.$debug_output;
-					} else {
-                    	return $results;
-					}
+                    return $results;
                 }
             }
         }
@@ -588,16 +581,9 @@ class Smarty
 			if ($this->debugging) { echo $this->_generate_debug_output(); }
             return;
         } else {
-            if (isset($results)) {
-				if ($this->debugging) {
-					$debug_output = $this->_generate_debug_output();
-					return $results.$debug_output;
-				} else {
-					return $results;
-				}
-			}
+            if (isset($results)) { return $results; }
         }
-    }   
+    }
 
 /*======================================================================*\
 	Function:	_generate_debug_output()