Changes in trunk/wp-includes/cache.php [3812:3465]

File:

• trunk/wp-includes/cache.php (modified) (14 diffs)

trunk/wp-includes/cache.php

@@ -48 +48 @@
 }
 
-define('CACHE_SERIAL_HEADER', "<?php\n/*");
-define('CACHE_SERIAL_FOOTER', "*/\n?".">");
+define('CACHE_SERIAL_HEADER', "<?php\n//");
+define('CACHE_SERIAL_FOOTER', "\n?".">");
 
 class WP_Object_Cache {
@@ -65 +65 @@
     var $warm_cache_hits = 0;
     var $cache_misses = 0;
-    var $secret = '';
 
     function acquire_lock() {
@@ -105 +104 @@
         if ( ! $this->acquire_lock() )
             return false;
-
+        
         $this->rm_cache_dir();
         $this->cache = array ();
         $this->dirty_objects = array ();
         $this->non_existant_objects = array ();
-
+        
         $this->release_lock();
 
@@ -144 +143 @@
         }
 
-        $cache_file = $this->cache_dir.$this->get_group_dir($group)."/".$this->hash($id).'.php';
+        $cache_file = $this->cache_dir.$this->get_group_dir($group)."/".md5($id.DB_PASSWORD).'.php';
         if (!file_exists($cache_file)) {
             $this->non_existant_objects[$group][$id] = true;
@@ -160 +159 @@
         }
 
-        $this->cache[$group][$id] = unserialize(base64_decode(substr(@ file_get_contents($cache_file), strlen(CACHE_SERIAL_HEADER), -strlen(CACHE_SERIAL_FOOTER))));
+        $this->cache[$group][$id] = unserialize(substr(@ file_get_contents($cache_file), strlen(CACHE_SERIAL_HEADER), -strlen(CACHE_SERIAL_FOOTER)));
         if (false === $this->cache[$group][$id])
             $this->cache[$group][$id] = '';
@@ -173 +172 @@
 
         return "{$this->blog_id}/$group";
-    }
-
-    function hash($data) {
-        if ( function_exists('hash_hmac') ) {
-            return hash_hmac('md5', $data, $this->secret);
-        } else {
-            return md5($data . $this->secret);
-        }
     }
 
@@ -191 +182 @@
                 foreach ($dogs as $catt)
                     $this->cache['category'][$catt->cat_ID] = $catt;
+
+                foreach ($this->cache['category'] as $catt) {
+                    $curcat = $catt->cat_ID;
+                    $fullpath = '/'.$this->cache['category'][$catt->cat_ID]->category_nicename;
+                    while ($this->cache['category'][$curcat]->category_parent != 0) {
+                        $curcat = $this->cache['category'][$curcat]->category_parent;
+                        $fullpath = '/'.$this->cache['category'][$curcat]->category_nicename.$fullpath;
+                    }
+                    $this->cache['category'][$catt->cat_ID]->fullpath = $fullpath;
+                }
             }
         } else
@@ -248 +249 @@
                 if ($file == '.' or $file == '..')
                     continue;
-
+                    
                 if (@ is_dir($dir . DIRECTORY_SEPARATOR . $file))
                     $stack[] = $dir . DIRECTORY_SEPARATOR . $file;
@@ -332 +333 @@
             $ids = array_unique($ids);
             foreach ($ids as $id) {
-                $cache_file = $group_dir.$this->hash($id).'.php';
+                $cache_file = $group_dir.md5($id.DB_PASSWORD).'.php';
 
                 // Remove the cache file if the key is not set.
@@ -342 +343 @@
 
                 $temp_file = tempnam($group_dir, 'tmp');
-                $serial = CACHE_SERIAL_HEADER.base64_encode(serialize($this->cache[$group][$id])).CACHE_SERIAL_FOOTER;
+                $serial = CACHE_SERIAL_HEADER.serialize($this->cache[$group][$id]).CACHE_SERIAL_FOOTER;
                 $fd = @fopen($temp_file, 'w');
                 if ( false === $fd ) {
@@ -354 +355 @@
                         @ unlink($temp_file);
                     else
-                        $errors++;
+                        $errors++;  
                 }
                 @ chmod($cache_file, $file_perms);
@@ -363 +364 @@
 
         $this->release_lock();
-
+        
         if ( $errors )
             return false;
@@ -400 +401 @@
             return;
 
-        if ( ! defined('ENABLE_CACHE') )
-            return;
-
         // Disable the persistent cache if safe_mode is on.
         if ( ini_get('safe_mode') && ! defined('ENABLE_CACHE') )
@@ -424 +422 @@
             $this->expiration_time = CACHE_EXPIRATION_TIME;
 
-        if ( defined('WP_SECRET') )
-            $this->secret = WP_SECRET;
-        else
-            $this->secret = DB_PASSWORD . DB_USER . DB_NAME . DB_HOST . ABSPATH;
-
-        $this->blog_id = $this->hash($blog_id);
+        $this->blog_id = md5($blog_id);
     }
 }