*** empty log message ***

Smarty.addons.php

@@ -615,7 +615,7 @@ 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);
+	//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);

Smarty.class.php

@@ -160,7 +160,7 @@ class Smarty
 /* END SMARTY CONFIGURATION SECTION                                       */    
 /* There should be no need to touch anything below this line.             */
 /**************************************************************************/
-    
+ 
     // internal vars
     var $_error_msg             =   false;      // error messages. true/false
     var $_tpl_vars              =   array();    // where assigned template vars are kept
@@ -170,8 +170,10 @@ class Smarty
     var $_smarty_md5            =   'f8d698aea36fcbead2b9d5359ffca76f'; // md5 checksum of the string 'Smarty'    
     var $_version               =   '1.4.2';    // Smarty version number    
     var $_extract               =   false;      // flag for custom functions
-    var $_included_tpls            =    array();    // list of included templates
+    var $_included_tpls         =   array();    // list of run-time included templates
+    var $_inclusion_depth       =   0;          // current template inclusion depth
     
+
 /*======================================================================*\
     Function: Smarty
     Purpose:  Constructor
@@ -492,7 +494,11 @@ class Smarty
     {
         global $HTTP_SERVER_VARS, $QUERY_STRING, $HTTP_COOKIE_VARS;
 
-        $this->_included_tpls[] = $tpl_file;
+        $this->_inclusion_depth = 0;
+        $this->_included_tpls = array();
+
+        $this->_included_tpls[] = array('template'  => $tpl_file,
+                                        'depth'    => 0);
         
         if ($this->caching) {
             // cache name = template path + cache_id
@@ -765,6 +771,9 @@ class Smarty
 \*======================================================================*/
     function _smarty_include($_smarty_include_tpl_file, $_smarty_include_vars)
     {
+        $this->_included_tpls[] = array('template' => $_smarty_include_tpl_file,
+                                        'depth'    => ++$this->_inclusion_depth);
+
         $this->_tpl_vars = array_merge($this->_tpl_vars, $_smarty_include_vars);
         extract($this->_tpl_vars);
 
@@ -782,9 +791,8 @@ class Smarty
             echo "\n<!-- SMARTY_END: ".$_smarty_include_tpl_file." -->\n";
         }
 
-        $this->_included_tpls[] = $_smarty_include_tpl_file;
-        
         array_shift($this->_config);
+        $this->_inclusion_depth--;
     }
         
     

demo/templates/debug.tpl

@@ -9,7 +9,7 @@
 	_smarty_console.document.write("<tr bgcolor=#cccccc><th colspan=2>Smarty Debug Console</th></tr>");
 	_smarty_console.document.write("<tr bgcolor=#cccccc><td colspan=2><b>included templates:</b></td></tr>");
 	{section name=templates loop=$_debug_tpls}
-		_smarty_console.document.write("<tr bgcolor={if %templates.index% is even}#eeeeee{else}#fafafa{/if}><td colspan=2><tt><font color=blue>{$_debug_tpls[templates]}</font></tt></td></tr>");
+		_smarty_console.document.write("<tr bgcolor={if %templates.index% is even}#eeeeee{else}#fafafa{/if}><td colspan=2><tt>{section name=indent loop=$_debug_tpls[templates].depth}&nbsp;&nbsp;&nbsp;{/section}<font color=blue>{$_debug_tpls[templates].template}</font></tt></td></tr>");
 	{/section}
 	_smarty_console.document.write("<tr bgcolor=#cccccc><td colspan=2><b>assigned template variables:</b></td></tr>");
 	{section name=vars loop=$_debug_keys}

libs/Smarty.class.php

@@ -160,7 +160,7 @@ class Smarty
 /* END SMARTY CONFIGURATION SECTION                                       */    
 /* There should be no need to touch anything below this line.             */
 /**************************************************************************/
-    
+ 
     // internal vars
     var $_error_msg             =   false;      // error messages. true/false
     var $_tpl_vars              =   array();    // where assigned template vars are kept
@@ -170,8 +170,10 @@ class Smarty
     var $_smarty_md5            =   'f8d698aea36fcbead2b9d5359ffca76f'; // md5 checksum of the string 'Smarty'    
     var $_version               =   '1.4.2';    // Smarty version number    
     var $_extract               =   false;      // flag for custom functions
-    var $_included_tpls            =    array();    // list of included templates
+    var $_included_tpls         =   array();    // list of run-time included templates
+    var $_inclusion_depth       =   0;          // current template inclusion depth
     
+
 /*======================================================================*\
     Function: Smarty
     Purpose:  Constructor
@@ -492,7 +494,11 @@ class Smarty
     {
         global $HTTP_SERVER_VARS, $QUERY_STRING, $HTTP_COOKIE_VARS;
 
-        $this->_included_tpls[] = $tpl_file;
+        $this->_inclusion_depth = 0;
+        $this->_included_tpls = array();
+
+        $this->_included_tpls[] = array('template'  => $tpl_file,
+                                        'depth'    => 0);
         
         if ($this->caching) {
             // cache name = template path + cache_id
@@ -765,6 +771,9 @@ class Smarty
 \*======================================================================*/
     function _smarty_include($_smarty_include_tpl_file, $_smarty_include_vars)
     {
+        $this->_included_tpls[] = array('template' => $_smarty_include_tpl_file,
+                                        'depth'    => ++$this->_inclusion_depth);
+
         $this->_tpl_vars = array_merge($this->_tpl_vars, $_smarty_include_vars);
         extract($this->_tpl_vars);
 
@@ -782,9 +791,8 @@ class Smarty
             echo "\n<!-- SMARTY_END: ".$_smarty_include_tpl_file." -->\n";
         }
 
-        $this->_included_tpls[] = $_smarty_include_tpl_file;
-        
         array_shift($this->_config);
+        $this->_inclusion_depth--;
     }
         
     

templates/debug.tpl

@@ -9,7 +9,7 @@
 	_smarty_console.document.write("<tr bgcolor=#cccccc><th colspan=2>Smarty Debug Console</th></tr>");
 	_smarty_console.document.write("<tr bgcolor=#cccccc><td colspan=2><b>included templates:</b></td></tr>");
 	{section name=templates loop=$_debug_tpls}
-		_smarty_console.document.write("<tr bgcolor={if %templates.index% is even}#eeeeee{else}#fafafa{/if}><td colspan=2><tt><font color=blue>{$_debug_tpls[templates]}</font></tt></td></tr>");
+		_smarty_console.document.write("<tr bgcolor={if %templates.index% is even}#eeeeee{else}#fafafa{/if}><td colspan=2><tt>{section name=indent loop=$_debug_tpls[templates].depth}&nbsp;&nbsp;&nbsp;{/section}<font color=blue>{$_debug_tpls[templates].template}</font></tt></td></tr>");
 	{/section}
 	_smarty_console.document.write("<tr bgcolor=#cccccc><td colspan=2><b>assigned template variables:</b></td></tr>");
 	{section name=vars loop=$_debug_keys}