Update Smarty to 2.6.21

git-svn-id: http://piwigo.org/svn/trunk@2961 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice
2008-12-09 16:08:48 +00:00
parent c3e65e4a86
commit c7e54656fe
6 changed files with 56 additions and 31 deletions
+7 -15
View File
@@ -20,17 +20,17 @@
*
* For questions, help, comments, discussion, etc., please join the
* Smarty mailing list. Send a blank e-mail to
* smarty-general-subscribe@lists.php.net
* smarty-discussion-subscribe@googlegroups.com
*
* @link http://smarty.php.net/
* @link http://www.smarty.net/
* @copyright 2001-2005 New Digital Group, Inc.
* @author Monte Ohrt <monte at ohrt dot com>
* @author Andrei Zmievski <andrei@php.net>
* @package Smarty
* @version 2.6.20
* @version 2.6.21
*/
/* $Id: Smarty.class.php 2722 2007-06-18 14:29:00Z danilo $ */
/* $Id: Smarty.class.php 2785 2008-09-18 21:04:12Z Uwe.Tews $ */
/**
* DIR_SEP isn't used anymore, but third party apps might
@@ -464,7 +464,7 @@ class Smarty
*
* @var string
*/
var $_version = '2.6.20';
var $_version = '2.6.21';
/**
* current template inclusion depth
@@ -1292,19 +1292,11 @@ class Smarty
if ($display) {
if (isset($_smarty_results)) { echo $_smarty_results; }
}
if ($this->debugging) {
// capture time for debugging info
$_params = array();
require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
$this->_smarty_debug_info[$_included_tpls_idx]['exec_time'] = (smarty_core_get_microtime($_params, $this) - $_debug_start_time);
}
if ($display) {
if ($this->debugging) {
// capture time for debugging info
$_params = array();
require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
$this->_smarty_debug_info[$_included_tpls_idx]['exec_time'] = (smarty_core_get_microtime($_params, $this) - $_debug_start_time);
require_once(SMARTY_CORE_DIR . 'core.display_debug_console.php');
echo smarty_core_display_debug_console($_params, $this);
}