From 9428613b2da6132ef507e92461535283d48ecdc1 Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Wed, 4 Feb 2009 02:33:50 +0000
Subject: merge 3120 from trunk optimizations (php only) - removed unnecessary
 call to array_unique in get_image_ids_for_tags - put back in smarty exec time
 counting (debug mode) for each included template - prefix some smarty
 modifiers with @ in some templates - do not call format_date (still very slow
 due to mktime and date even after prev commit) from category_default.inc.php
 - if used in templates format_date can be used as a smarty modifier

git-svn-id: http://piwigo.org/svn/branches/2.0@3121 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/smarty/libs/Smarty.class.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'include/smarty')

diff --git a/include/smarty/libs/Smarty.class.php b/include/smarty/libs/Smarty.class.php
index 95ec67bab..8e56346f9 100644
--- a/include/smarty/libs/Smarty.class.php
+++ b/include/smarty/libs/Smarty.class.php
@@ -20,7 +20,7 @@
  *
  * 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/
  * @copyright 2001-2005 New Digital Group, Inc.
@@ -1057,7 +1057,7 @@ class Smarty
         } else {
             // var non-existant, return valid reference
             $_tmp = null;
-            return $_tmp;   
+            return $_tmp;
         }
     }
 
@@ -1116,7 +1116,7 @@ class Smarty
     function fetch($resource_name, $cache_id = null, $compile_id = null, $display = false)
     {
         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);
 
@@ -1303,6 +1303,12 @@ class Smarty
             error_reporting($_smarty_old_error_level);
             return;
         } else {
+            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);
+            }
             error_reporting($_smarty_old_error_level);
             if (isset($_smarty_results)) { return $_smarty_results; }
         }
@@ -1932,10 +1938,10 @@ class Smarty
     {
         return eval($code);
     }
-    
+
     /**
      * Extracts the filter name from the given callback
-     * 
+     *
      * @param callback $function
      * @return string
      */
@@ -1950,7 +1956,7 @@ class Smarty
 			return $function;
 		}
 	}
-    
+
     /**#@-*/
 
 }
-- 
cgit v1.2.3