From 5768f134e8868879d2d57f625ab700cf32bc9370 Mon Sep 17 00:00:00 2001 From: mohrt Date: Wed, 19 Sep 2001 14:52:08 +0000 Subject: [PATCH] updated version numbers --- Config_File.class.php | 2 +- NEWS | 2 ++ README | 2 +- RELEASE_NOTES | 6 ++++++ Smarty.addons.php | 3 ++- Smarty.class.php | 17 ++++++++++++----- Smarty_Compiler.class.php | 2 +- demo/templates/debug.tpl | 4 ++-- libs/Config_File.class.php | 2 +- libs/Smarty.class.php | 17 ++++++++++++----- libs/Smarty_Compiler.class.php | 2 +- templates/debug.tpl | 4 ++-- 12 files changed, 43 insertions(+), 20 deletions(-) diff --git a/Config_File.class.php b/Config_File.class.php index f3ecfcde..fa65e4d4 100644 --- a/Config_File.class.php +++ b/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 * @access public * diff --git a/NEWS b/NEWS index 48c13f29..9bff0bf0 100644 --- a/NEWS +++ b/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) diff --git a/README b/README index b508d6ba..75330610 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ NAME: Smarty - the PHP compiling template engine -VERSION: 1.4.4 +VERSION: 1.4.5 AUTHORS: diff --git a/RELEASE_NOTES b/RELEASE_NOTES index cab8a7ff..c55c5f35 100644 --- a/RELEASE_NOTES +++ b/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 ----- diff --git a/Smarty.addons.php b/Smarty.addons.php index 6874110c..b2b06f25 100644 --- a/Smarty.addons.php +++ b/Smarty.addons.php @@ -4,7 +4,7 @@ * File: Smarty.addons.php * Author: Monte Ohrt * Andrei Zmievski - * 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)); diff --git a/Smarty.class.php b/Smarty.class.php index 12d88290..104b1655 100644 --- a/Smarty.class.php +++ b/Smarty.class.php @@ -5,7 +5,7 @@ * Author: Monte Ohrt * Andrei Zmievski * - * 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) diff --git a/Smarty_Compiler.class.php b/Smarty_Compiler.class.php index 51d91b78..023eaad0 100644 --- a/Smarty_Compiler.class.php +++ b/Smarty_Compiler.class.php @@ -6,7 +6,7 @@ * Author: Monte Ohrt * Andrei Zmievski * - * 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 diff --git a/demo/templates/debug.tpl b/demo/templates/debug.tpl index 6a0fc179..efe9077f 100644 --- a/demo/templates/debug.tpl +++ b/demo/templates/debug.tpl @@ -7,9 +7,9 @@ _smarty_console.document.write("Smarty Debug Console"); _smarty_console.document.write(""); _smarty_console.document.write(""); - _smarty_console.document.write(""); + _smarty_console.document.write(""); {section name=templates loop=$_debug_tpls} - _smarty_console.document.write(""); + _smarty_console.document.write(""); {sectionelse} _smarty_console.document.write(""); {/section} diff --git a/libs/Config_File.class.php b/libs/Config_File.class.php index f3ecfcde..fa65e4d4 100644 --- a/libs/Config_File.class.php +++ b/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 * @access public * diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php index 12d88290..104b1655 100644 --- a/libs/Smarty.class.php +++ b/libs/Smarty.class.php @@ -5,7 +5,7 @@ * Author: Monte Ohrt * Andrei Zmievski * - * 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) diff --git a/libs/Smarty_Compiler.class.php b/libs/Smarty_Compiler.class.php index 51d91b78..023eaad0 100644 --- a/libs/Smarty_Compiler.class.php +++ b/libs/Smarty_Compiler.class.php @@ -6,7 +6,7 @@ * Author: Monte Ohrt * Andrei Zmievski * - * 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 diff --git a/templates/debug.tpl b/templates/debug.tpl index 6a0fc179..efe9077f 100644 --- a/templates/debug.tpl +++ b/templates/debug.tpl @@ -7,9 +7,9 @@ _smarty_console.document.write("Smarty Debug Console"); _smarty_console.document.write("
Smarty Debug Console
included templates:
included templates & config files:
{section name=indent loop=$_debug_tpls[templates].depth}   {/section}{$_debug_tpls[templates].template}
{section name=indent loop=$_debug_tpls[templates].depth}   {/section}{$_debug_tpls[templates].filename}
no templates included
"); _smarty_console.document.write(""); - _smarty_console.document.write(""); + _smarty_console.document.write(""); {section name=templates loop=$_debug_tpls} - _smarty_console.document.write(""); + _smarty_console.document.write(""); {sectionelse} _smarty_console.document.write(""); {/section}
Smarty Debug Console
included templates:
included templates & config files:
{section name=indent loop=$_debug_tpls[templates].depth}   {/section}{$_debug_tpls[templates].template}
{section name=indent loop=$_debug_tpls[templates].depth}   {/section}{$_debug_tpls[templates].filename}
no templates included