From 54b95fccd5ee39122aa38aaa94e19f521f3d0a40 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 24 Jan 2014 14:22:06 +0100
Subject: [PATCH] create cache for BaseLoop::count method

---
 .../Thelia/Core/Template/Element/BaseLoop.php | 44 +++++++++++--------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Element/BaseLoop.php b/core/lib/Thelia/Core/Template/Element/BaseLoop.php
index 7b409a0c1..2aa5e874f 100644
--- a/core/lib/Thelia/Core/Template/Element/BaseLoop.php
+++ b/core/lib/Thelia/Core/Template/Element/BaseLoop.php
@@ -67,7 +67,8 @@ abstract class BaseLoop
     protected $timestampable = false;
     protected $versionable = false;
 
-    private static $cache = array();
+    private static $cacheLoopResult = array();
+    private static $cacheCount = array();
 
     /**
      * Create a new Loop
@@ -337,24 +338,29 @@ abstract class BaseLoop
 
     public function count()
     {
-        $count = 0;
-        if ($this instanceof PropelSearchLoopInterface) {
-            $searchModelCriteria = $this->buildModelCriteria();
-            if (null === $searchModelCriteria) {
-                $count = 0;
-            } else {
-                $count = $searchModelCriteria->count();
-            }
-        } elseif ($this instanceof ArraySearchLoopInterface) {
-            $searchArray = $this->buildArray();
-            if (null === $searchArray) {
-                $count = 0;
-            } else {
-                $count = count($searchArray);
+        $hash = $this->args->getHash();
+        if(false === array_key_exists($hash, self::$cacheCount))
+        {
+            $count = 0;
+            if ($this instanceof PropelSearchLoopInterface) {
+                $searchModelCriteria = $this->buildModelCriteria();
+                if (null === $searchModelCriteria) {
+                    $count = 0;
+                } else {
+                    $count = $searchModelCriteria->count();
+                }
+            } elseif ($this instanceof ArraySearchLoopInterface) {
+                $searchArray = $this->buildArray();
+                if (null === $searchArray) {
+                    $count = 0;
+                } else {
+                    $count = count($searchArray);
+                }
             }
+            self::$cacheCount[$hash] = $count;
         }
 
-        return $count;
+        return self::$cacheCount[$hash];
     }
 
     /**
@@ -364,7 +370,7 @@ abstract class BaseLoop
     public function exec(&$pagination)
     {
         $hash = $this->args->getHash();
-        if(false === array_key_exists($hash, self::$cache))
+        if(false === array_key_exists($hash, self::$cacheLoopResult))
         {
             if ($this instanceof PropelSearchLoopInterface) {
                 $searchModelCriteria = $this->buildModelCriteria();
@@ -400,10 +406,10 @@ abstract class BaseLoop
                 $loopResult->setVersioned();
             }
 
-            self::$cache[$hash] = $this->parseResults($loopResult);
+            self::$cacheLoopResult[$hash] = $this->parseResults($loopResult);
         }
 
-        return self::$cache[$hash];
+        return self::$cacheLoopResult[$hash];
 
     }