From 5e8f21b65bee14fe38fbd2cbd32f65ab6fef3055 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Tue, 21 Feb 2012 16:51:33 +0100
Subject: [PATCH] Refactor Cache services

---
 lib/classes/appbox.class.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/classes/appbox.class.php b/lib/classes/appbox.class.php
index 711230fcce..0d87d0d56f 100644
--- a/lib/classes/appbox.class.php
+++ b/lib/classes/appbox.class.php
@@ -311,10 +311,9 @@ class appbox extends base
      * Step 1
      */
     $upgrader->set_current_message(_('Flushing cache'));
-    if ($this->get_cache()->ping())
-    {
-      $this->get_cache()->flush();
-    }
+
+    $this->Core['CacheService']->flushAll();
+
     $upgrader->add_steps_complete(1);
 
 
@@ -386,10 +385,9 @@ class appbox extends base
      * Step 9
      */
     $upgrader->set_current_message(_('Flushing cache'));
-    if ($this->get_cache()->ping())
-    {
-      $this->get_cache()->flush();
-    }
+
+    $this->Core['CacheService']->flushAll();
+    
     $upgrader->add_steps_complete(1);
 
     return $advices;