Changeset 3704 for branches/2.0/include

Timestamp:

Jul 30, 2009, 6:00:04 AM (15 years ago)

Author:

rvelices

Message:

merge r3703 from trunk - fix smarty debugging info (not important)

File:

• branches/2.0/include/smarty/libs/Smarty.class.php (modified) (6 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-discussion-subscribe@googlegroups.com 
+ * smarty-discussion-subscribe@googlegroups.com
  *
  * @link http://www.smarty.net/
@@ -1059 +1059 @@
             // var non-existant, return valid reference
             $_tmp = null;
-            return $_tmp;   
+            return $_tmp;
         }
     }
@@ -1118 +1118 @@
     {
         static $_cache_info = array();
-        
+
         $_smarty_old_error_level = $this->debugging ? error_reporting() : error_reporting(isset($this->error_reporting)
                ? $this->error_reporting : error_reporting() & ~E_NOTICE);
@@ -1305 +1305 @@
             return;
         } else {
+            if ($this->debugging) {
+                // capture time for debugging info
+                require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
+                $this->_smarty_debug_info[$_included_tpls_idx]['exec_time'] = (smarty_core_get_microtime(array(), $this) - $_debug_start_time);
+            }
             error_reporting($_smarty_old_error_level);
             if (isset($_smarty_results)) { return $_smarty_results; }
@@ -1934 +1939 @@
         return eval($code);
     }
-    
+
     /**
      * Extracts the filter name from the given callback
-     * 
+     *
      * @param callback $function
      * @return string
@@ -1952 +1957 @@
                 }
         }
-  
+
     /**#@-*/