updated version numbers

Config_File.class.php

@@ -5,7 +5,7 @@ require_once "PEAR.php";
 /**
  * Config_File class.
  *
- * @version 1.4.4
+ * @version 1.4.5
  * @author Andrei Zmievski <andrei@php.net>
  * @access public
  * 

NEWS

@@ -1,3 +1,5 @@
+Version 1.4.5
+-------------
     - update FAQ with index of questions at the top
     - update overlib to 3.50, adjust addon code so that the overlib.js
       file isn't modified, and not using the mini one. (Monte)

README

@@ -2,7 +2,7 @@ NAME:
 
     Smarty - the PHP compiling template engine
 
-VERSION: 1.4.4
+VERSION: 1.4.5
 
 AUTHORS:
     

RELEASE_NOTES

@@ -1,3 +1,9 @@
+1.4.5
+-----
+
+Mostly bug fixes and minor improvements. Added compile id for separate compiled
+versions of the same script. See the ChangeLog for detailed changes.
+
 1.4.4
 -----
 

Smarty.addons.php

@@ -4,7 +4,7 @@
  * File:        Smarty.addons.php
  * Author:      Monte Ohrt <monte@ispi.net>
  *              Andrei Zmievski <andrei@php.net>
- * Version:     1.4.4
+ * Version:     1.4.5
  * Copyright:   2001 ispi of Lincoln, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -685,6 +685,7 @@ function smarty_func_assign_debug_info($args, &$smarty_obj) {
 	$config_vars = $smarty_obj->_config[0];
 	ksort($config_vars);
 	$included_templates = $smarty_obj->_included_tpls;
+	
 	$smarty_obj->assign("_debug_keys",array_keys($assigned_vars));
 	$smarty_obj->assign("_debug_vals",array_values($assigned_vars));
 	$smarty_obj->assign("_debug_config_keys",array_keys($config_vars));

Smarty.class.php

@@ -5,7 +5,7 @@
  * Author:      Monte Ohrt <monte@ispi.net>
  *              Andrei Zmievski <andrei@php.net>
  *
- * Version:             1.4.4
+ * Version:             1.4.5
  * Copyright:           2001 ispi of Lincoln, Inc.
  *              
  * This library is free software; you can redistribute it and/or
@@ -143,7 +143,7 @@ class Smarty
                                     'assign'            => 'smarty_func_assign',
                                     'popup_init'      	=> 'smarty_func_overlib_init',
                                     'popup'           	=> 'smarty_func_overlib',
-                                    'assign_debug_info' => 'smarty_func_assign_debug_info'            
+                                    'assign_debug_info' => 'smarty_func_assign_debug_info'
                                  );
     
     var $custom_mods     =  array(  'lower'             => 'strtolower',
@@ -190,7 +190,7 @@ class Smarty
     var $_conf_obj             =   null;       // configuration object
     var $_config               =   array();    // loaded configuration settings
     var $_smarty_md5           =   'f8d698aea36fcbead2b9d5359ffca76f'; // md5 checksum of the string 'Smarty'    
-    var $_version              =   '1.4.4';    // Smarty version number    
+    var $_version              =   '1.4.5';    // Smarty version number    
     var $_extract              =   false;      // flag for custom functions
     var $_included_tpls        =   array();    // list of run-time included templates
     var $_inclusion_depth      =   0;          // current template inclusion depth
@@ -471,7 +471,8 @@ class Smarty
         $this->_inclusion_depth = 0;
         $this->_included_tpls = array();
 
-        $this->_included_tpls[] = array('template'  => $tpl_file,
+        $this->_included_tpls[] = array('type' => 'template',
+										'filename'  => $tpl_file,
                                         'depth'    => 0);
         
         if ($this->caching) {
@@ -805,7 +806,8 @@ function _generate_debug_output() {
 \*======================================================================*/
     function _smarty_include($_smarty_include_tpl_file, $_smarty_include_vars)
     {
-        $this->_included_tpls[] = array('template' => $_smarty_include_tpl_file,
+        $this->_included_tpls[] = array('type' => 'template',
+										'filename' => $_smarty_include_tpl_file,
                                         'depth'    => ++$this->_inclusion_depth);
 
         $this->_tpl_vars = array_merge($this->_tpl_vars, $_smarty_include_vars);
@@ -836,6 +838,11 @@ function _generate_debug_output() {
 \*======================================================================*/
     function _config_load($file, $section, $scope)
     {
+		$this->_included_tpls[] = array('type' => 'config',
+								'filename' => $file,
+                            	'depth'    => $this->_inclusion_depth);
+
+		
         $this->_config[0] = array_merge($this->_config[0], $this->_conf_obj->get($file));
         if ($scope == 'parent') {
             if (count($this->_config) > 0)

Smarty_Compiler.class.php

@@ -6,7 +6,7 @@
  * Author:      Monte Ohrt <monte@ispi.net>
  *              Andrei Zmievski <andrei@php.net>
  *
- * Version:             1.4.4
+ * Version:             1.4.5
  * Copyright:           2001 ispi of Lincoln, Inc.
  *
  * This library is free software; you can redistribute it and/or

demo/templates/debug.tpl

@@ -7,9 +7,9 @@
 	_smarty_console.document.write("<HTML><TITLE>Smarty Debug Console</TITLE><BODY bgcolor=#ffffff>");
 	_smarty_console.document.write("<table border=0 width=100%>");
 	_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>");
+	_smarty_console.document.write("<tr bgcolor=#cccccc><td colspan=2><b>included templates & config files:</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>{section name=indent loop=$_debug_tpls[templates].depth}&nbsp;&nbsp;&nbsp;{/section}<font color=brown>{$_debug_tpls[templates].template}</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={if $_debug_tpls[templates].type eq "template"}brown{else}green{/if}>{$_debug_tpls[templates].filename}</font></tt></td></tr>");
 	{sectionelse}
 		_smarty_console.document.write("<tr bgcolor=#eeeeee><td colspan=2><tt><i>no templates included</i></tt></td></tr>");	
 	{/section}

libs/Config_File.class.php

@@ -5,7 +5,7 @@ require_once "PEAR.php";
 /**
  * Config_File class.
  *
- * @version 1.4.4
+ * @version 1.4.5
  * @author Andrei Zmievski <andrei@php.net>
  * @access public
  * 

libs/Smarty.class.php

@@ -5,7 +5,7 @@
  * Author:      Monte Ohrt <monte@ispi.net>
  *              Andrei Zmievski <andrei@php.net>
  *
- * Version:             1.4.4
+ * Version:             1.4.5
  * Copyright:           2001 ispi of Lincoln, Inc.
  *              
  * This library is free software; you can redistribute it and/or
@@ -143,7 +143,7 @@ class Smarty
                                     'assign'            => 'smarty_func_assign',
                                     'popup_init'      	=> 'smarty_func_overlib_init',
                                     'popup'           	=> 'smarty_func_overlib',
-                                    'assign_debug_info' => 'smarty_func_assign_debug_info'            
+                                    'assign_debug_info' => 'smarty_func_assign_debug_info'
                                  );
     
     var $custom_mods     =  array(  'lower'             => 'strtolower',
@@ -190,7 +190,7 @@ class Smarty
     var $_conf_obj             =   null;       // configuration object
     var $_config               =   array();    // loaded configuration settings
     var $_smarty_md5           =   'f8d698aea36fcbead2b9d5359ffca76f'; // md5 checksum of the string 'Smarty'    
-    var $_version              =   '1.4.4';    // Smarty version number    
+    var $_version              =   '1.4.5';    // Smarty version number    
     var $_extract              =   false;      // flag for custom functions
     var $_included_tpls        =   array();    // list of run-time included templates
     var $_inclusion_depth      =   0;          // current template inclusion depth
@@ -471,7 +471,8 @@ class Smarty
         $this->_inclusion_depth = 0;
         $this->_included_tpls = array();
 
-        $this->_included_tpls[] = array('template'  => $tpl_file,
+        $this->_included_tpls[] = array('type' => 'template',
+										'filename'  => $tpl_file,
                                         'depth'    => 0);
         
         if ($this->caching) {
@@ -805,7 +806,8 @@ function _generate_debug_output() {
 \*======================================================================*/
     function _smarty_include($_smarty_include_tpl_file, $_smarty_include_vars)
     {
-        $this->_included_tpls[] = array('template' => $_smarty_include_tpl_file,
+        $this->_included_tpls[] = array('type' => 'template',
+										'filename' => $_smarty_include_tpl_file,
                                         'depth'    => ++$this->_inclusion_depth);
 
         $this->_tpl_vars = array_merge($this->_tpl_vars, $_smarty_include_vars);
@@ -836,6 +838,11 @@ function _generate_debug_output() {
 \*======================================================================*/
     function _config_load($file, $section, $scope)
     {
+		$this->_included_tpls[] = array('type' => 'config',
+								'filename' => $file,
+                            	'depth'    => $this->_inclusion_depth);
+
+		
         $this->_config[0] = array_merge($this->_config[0], $this->_conf_obj->get($file));
         if ($scope == 'parent') {
             if (count($this->_config) > 0)

libs/Smarty_Compiler.class.php

@@ -6,7 +6,7 @@
  * Author:      Monte Ohrt <monte@ispi.net>
  *              Andrei Zmievski <andrei@php.net>
  *
- * Version:             1.4.4
+ * Version:             1.4.5
  * Copyright:           2001 ispi of Lincoln, Inc.
  *
  * This library is free software; you can redistribute it and/or

templates/debug.tpl

@@ -7,9 +7,9 @@
 	_smarty_console.document.write("<HTML><TITLE>Smarty Debug Console</TITLE><BODY bgcolor=#ffffff>");
 	_smarty_console.document.write("<table border=0 width=100%>");
 	_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>");
+	_smarty_console.document.write("<tr bgcolor=#cccccc><td colspan=2><b>included templates & config files:</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>{section name=indent loop=$_debug_tpls[templates].depth}&nbsp;&nbsp;&nbsp;{/section}<font color=brown>{$_debug_tpls[templates].template}</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={if $_debug_tpls[templates].type eq "template"}brown{else}green{/if}>{$_debug_tpls[templates].filename}</font></tt></td></tr>");
 	{sectionelse}
 		_smarty_console.document.write("<tr bgcolor=#eeeeee><td colspan=2><tt><i>no templates included</i></tt></td></tr>");	
 	{/section}