From 5139a6fcd1b5a991ab10a7dc842a6676427aa86a Mon Sep 17 00:00:00 2001
From: "uwe.tews@googlemail.com" <uwe.tews@googlemail.com>
Date: Wed, 1 Dec 2010 23:34:06 +0000
Subject: [PATCH] - other update regarding {debug}

---
 libs/debug.tpl                            |  6 ------
 libs/sysplugins/smarty_internal_debug.php | 18 +++++++-----------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/libs/debug.tpl b/libs/debug.tpl
index 6ec86728..058c5b20 100644
--- a/libs/debug.tpl
+++ b/libs/debug.tpl
@@ -127,12 +127,6 @@ td {
 {/capture}
 <script type="text/javascript">
 {$id = $template_name|default:''|md5}
-    if ( self.name == '' ) {
-       var title = 'Console{$id}';
-      }
-    else {
-       var title = 'Console_{$id}' + self.name;
-      }
     _smarty_console = window.open("","console{$id}","width=680,height=600,resizable,scrollbars=yes");
     _smarty_console.document.write("{$debug_output|escape:'javascript'}");
     _smarty_console.document.close();
diff --git a/libs/sysplugins/smarty_internal_debug.php b/libs/sysplugins/smarty_internal_debug.php
index efc96ed7..0fd22a6a 100644
--- a/libs/sysplugins/smarty_internal_debug.php
+++ b/libs/sysplugins/smarty_internal_debug.php
@@ -114,27 +114,23 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data {
 	/*
 	* Recursively gets variables from all template/data scopes
 	*/
-	public static function get_debug_vars($obj, $is_parent = false)
+	public static function get_debug_vars($obj)
 	{
 		$config_vars = $obj->config_vars;
 		$tpl_vars = array();
 		foreach ($obj->tpl_vars as $key => $var) {
 			$tpl_vars[$key] = clone $var;
-			if (true) {
-				if ($obj instanceof Smarty_Internal_Template) {
-					$tpl_vars[$key]->scope = $obj->resource_type.':'.$obj->resource_name;
-				} elseif ($obj instanceof Smarty_Data) {
-					$tpl_vars[$key]->scope = 'Data object';
-				} else {
-					$tpl_vars[$key]->scope = 'Smarty root';
-				}
+			if ($obj instanceof Smarty_Internal_Template) {
+				$tpl_vars[$key]->scope = $obj->resource_type.':'.$obj->resource_name;
+			} elseif ($obj instanceof Smarty_Data) {
+				$tpl_vars[$key]->scope = 'Data object';
 			} else {
-				$tpl_vars[$key]->scope = 'local';
+				$tpl_vars[$key]->scope = 'Smarty root';
 			}
 		}
 
 		if (isset($obj->parent)) {
-			$parent = self::get_debug_vars($obj->parent, true);
+			$parent = self::get_debug_vars($obj->parent);
 			$tpl_vars = array_merge($parent->tpl_vars, $tpl_vars);
 			$config_vars = array_merge($parent->config_vars, $config_vars);
 		} else {