Changeset 2962 for branches/2.0/include/smarty/libs/Smarty.class.php

Timestamp:

12/09/08 17:12:25 (5 years ago)

Author:

patdenice

Message:

merge -c2961 from trunk to branch 2.0.
Update Smarty to 2.6.21

Files:

• branches/2.0/include/smarty/libs/Smarty.class.php (modified) (3 diffs)

branches/2.0/include/smarty/libs/Smarty.class.php

@@ -21 +21 @@
  * 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 $ */
 
 /**
@@ -465 +465 @@
      * @var string
      */
-    var $_version              = '2.6.20';
+    var $_version              = '2.6.21';
 
     /**
@@ -1293 +1293 @@
         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);