Changeset 3005 for trunk/system/libraries/drivers/Cache/Xcache.php

Timestamp:

07/08/2008 10:08:39 AM (5 months ago)

Author:

Shadowhand

Message:

Fixing #678, thanks Adura.

Files:

• trunk/system/libraries/drivers/Cache/Xcache.php (modified) (3 diffs)

trunk/system/libraries/drivers/Cache/Xcache.php

@@ -41 +41 @@
         public function delete($id, $tag = FALSE)
         {
-                if ($id === TRUE)
+                if ($tag !== FALSE)
                 {
                         Log::add('error', 'Cache: tags are unsupported by the Xcache driver');
                         return TRUE;
                 }
-                elseif ($tag == FALSE)
+                elseif($id !== TRUE)
+                {
+                        if (xcache_isset($id))
+                                return xcache_unset($id);
+
+                        return FALSE;
+                }
+                else
                 {
                         // Do the login
                         $this->auth();
-
                         $result = TRUE;
                         for ($i = 0, $max = xcache_count(XC_TYPE_VAR); $i < $max; $i++)
                         {
-                                if ( ! xcache_clear_cache(XC_TYPE_VAR, $i))
+                                if (xcache_clear_cache(XC_TYPE_VAR, $i) !== NULL)
                                 {
                                         $result = FALSE;
@@ -65 +71 @@
                         return $result;
                 }
-                else
-                {
-                        return TRUE;
-                }
+                
+                return TRUE;
+        }
+
+        public function delete_all()
+        {
+                return TRUE;
         }
 
@@ -105 +114 @@
                                 }
 
-                                $_SERVER[$key] = Config::item('cache_xcache.__'.$key);
+                                $_SERVER[$key] = Config::item('cache_xcache.'.$key);
                         }
                 }