Changeset 3088

Timestamp:

11/14/05 22:32:03 (3 years ago)

Author:

ryan

Message:

Flush the cache before installing. fixes #1877

Files:

• trunk/wp-admin/install.php (modified) (2 diffs)
• trunk/wp-includes/cache.php (modified) (18 diffs)

trunk/wp-admin/install.php

@@ -138 +138 @@
-
-// Set everything up
+wp_cache_flush();
-make_db_current_silent();
-populate_options();
@@ -199 +200 @@
-@wp_mail($admin_email, __('New WordPress Blog'), $message, $message_headers);
-
+wp_cache_flush();
-?>
-

trunk/wp-includes/cache.php

@@ -20 +20 @@
-function wp_cache_flush() {
-    global $wp_object_cache;
-
+
-    return $wp_object_cache->flush();
-}
@@ -61 +61 @@
-    var $cache = array ();
-    var $dirty_objects = array ();
-
-
+ 
+ 
-    var $blog_id;
-    var $cold_cache_hits = 0;
@@ -69 +69 @@
-
-    function add($id, $data, $group = 'default', $expire = '') {
- empty($group) 
-
-
- false !== $this->get($id, $group, false) 
+empty ($group)
+
+
+false !== $this->get($id, $group, false)
-            return false;
-
@@ -79 +79 @@
-
-    function delete($id, $group = 'default', $force = false) {
- empty($group) 
-
-
- !$force && false === $this->get($id, $group, false) 
+empty ($group)
+
+
+!$force && false === $this->get($id, $group, false)
-            return false;
-
@@ -92 +92 @@
-
-    function flush() {
-
-
-
+
+
+
+
+
+
+
-    function get($id, $group = 'default', $count_hits = true) {
- empty($group) 
+empty ($group)
-            $group = 'default';
-
-        if (isset ($this->cache[$group][$id])) {
- $count_hits 
+$count_hits
-                $this->warm_cache_hits += 1;
-            return $this->cache[$group][$id];
-        }
-
- isset($this->non_existant_objects[$group][$id]) 
+isset ($this->non_existant_objects[$group][$id])
-            return false;
-
@@ -123 +127 @@
-        }
-
- . $this->get_group_dir($group) . "/" . md5($id . DB_PASSWORD) . 
+.$this->get_group_dir($group)."/".md5($id.DB_PASSWORD).
-        if (!file_exists($cache_file)) {
-            $this->non_existant_objects[$group][$id] = true;
@@ -133 +137 @@
-        // a refresh.
-        $now = time();
- (filemtime($cache_file) + $this->expiration_time) <= $now 
+(filemtime($cache_file) + $this->expiration_time) <= $now
-            $this->cache_misses += 1;
-            $this->delete($id, $group, true);
@@ -140 +144 @@
-
-        $this->cache[$group][$id] = unserialize(substr(@ file_get_contents($cache_file), strlen(CACHE_SERIAL_HEADER), -strlen(CACHE_SERIAL_FOOTER)));
- 
+
-            $this->cache[$group][$id] = '';
-
@@ -148 +152 @@
-
-    function get_group_dir($group) {
- false !== array_search($group, $this->global_groups) 
+false !== array_search($group, $this->global_groups)
-            return $group;
-
@@ -173 +177 @@
-                }
-            }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -189 +194 @@
-        $group_dir = $this->get_group_dir($group);
-        $make_dir = '';
- 
+
-            $make_dir .= "$subdir/";
- . 
-   if (!mkdir($this->cache_dir . 
-   
-   @ chmod($this->cache_dir . 
-
-
- . $make_dir . 
- . $make_dir . 
-
-
-
- . 
+.
+if (!mkdir($this->cache_dir.
+
+@ chmod($this->cache_dir.
+
+
+.$make_dir.
+.$make_dir.
+
+
+
+.
-    }
-
-    function rm($fileglob) {
-       
-           return @
-
-
-
-
-
-           return @
-       
-           
-           
-               
-           $rcs = array_map(array
-           
-               
-           
-       
-   
+       
+           return @ 
+
+
+
+
+
+               return @ 
+           
+               
+               
+                   
+               $rcs = array_map(array 
+               
+                   
+               
+           
+   
-    }
-
-    function replace($id, $data, $group = 'default', $expire = '') {
- empty($group) 
-
-
- false === $this->get($id, $group, false) 
+empty ($group)
+
+
+false === $this->get($id, $group, false)
-            return false;
-
@@ -237 +242 @@
-
-    function set($id, $data, $group = 'default', $expire = '') {
- empty($group) 
-
-
- 
+empty ($group)
+
+
+
-            $data = '';
-
-        $this->cache[$group][$id] = $data;
-
+ 
-        $this->dirty_objects[$group][] = $id;
-
@@ -269 +274 @@
-            @ chmod($this->cache_dir, $dir_perms);
-        }
-
- . 
- . 
+
+.
+.
-        }
-
@@ -291 +296 @@
-            $ids = array_unique($ids);
-            foreach ($ids as $id) {
- . md5($id . DB_PASSWORD) . 
+.md5($id.DB_PASSWORD).
-
-                // Remove the cache file if the key is not set.
- ! isset($this->cache[$group][$id]) 
- file_exists($cache_file) 
+!isset ($this->cache[$group][$id])
+file_exists($cache_file)
-                        unlink($cache_file);
-                    continue;
@@ -301 +306 @@
-
-                $temp_file = tempnam($group_dir, 'tmp');
- . serialize($this->cache[$group][$id]) . 
+.serialize($this->cache[$group][$id]).
-                $fd = fopen($temp_file, 'w');
-                fputs($fd, $serial);
-               
-
- 
+
+ 
+
-                        unlink($temp_file);
-                    }
@@ -334 +339 @@
-            print_r($cache);
-            echo "</pre>";
- isset($this->dirty_objects[$group]) 
+isset ($this->dirty_objects[$group])
-                echo "<strong>Dirty Objects:</strong>";
-                echo "<pre>";
@@ -340 +345 @@
-                echo "</pre>";
-                echo "</p>";
-              
+
-        }
-    }
@@ -347 +352 @@
-        global $blog_id;
-
- defined('DISABLE_CACHE') 
+defined('DISABLE_CACHE')
-            return;
-
- defined('CACHE_PATH') 
+defined('CACHE_PATH')
-            $this->cache_dir = CACHE_PATH;
-        else
-            $this->cache_dir = ABSPATH.'wp-content/cache/';
-
- is_dir($this->cache_dir) 
- is_writable($this->cache_dir) 
+is_dir($this->cache_dir)
+is_writable($this->cache_dir)
-                $this->cache_enabled = true;
-
-
-
-
-
+
+
+
+
+
+
-            $this->expiration_time = CACHE_EXPIRATION_TIME;
-