Changeset 14076

Timestamp:

04/13/2010 12:43:40 PM (16 years ago)

Author:

ryan

Message:

Cache fixes for get_blog_details()

File:

• trunk/wp-includes/ms-blogs.php (modified) (2 diffs)

trunk/wp-includes/ms-blogs.php

@@ -126 +126 @@
     if ( $details ) {
         if ( ! is_object( $details ) ) {
-            if ( $details == -1 )
+            if ( $details == -1 ) {
                 return false;
-            else
+            } else {
                 // Clear old pre-serialized objects. Cache clients do better with that.
                 wp_cache_delete( $blog_id . $all, 'blog-details' );
-        }
-        return $details;
+                unset($details);
+            }
+        } else {
+            return $details;
+        }
     }
 
@@ -143 +146 @@
         if ( $details ) {
             if ( ! is_object( $details ) ) {
-                if ( $details == -1 )
+                if ( $details == -1 ) {
                     return false;
-                else
+                } else {
                     // Clear old pre-serialized objects. Cache clients do better with that.
-                    wp_cache_delete( $blog_id . $all, 'blog-details' );
+                    wp_cache_delete( $blog_id, 'blog-details' );
+                    unset($details);
+                }
+            } else {
+                return $details;
             }
-            return $details;
-        }
-    }
-
-    if ( !$details ) {
-        $details = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE blog_id = %d", $blog_id ) );
+        }
+    }
+
+    if ( empty($details) ) {
+        $details = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE blog_id = %d /* get_blog_details */", $blog_id ) );
         if ( ! $details ) {
             // Set the full cache.