Changeset 37929

Timestamp:

06/30/2016 04:39:31 PM (8 years ago)

Author:

jeremyfelt

Message:

Multisite: Revert [37874].

After [37923], get_blog_details() contained a now unnecessary attempt at back-compat for objects stored in cache.

See #36717.

File:

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

trunk/src/wp-includes/ms-blogs.php

@@ -184 +184 @@
                 unset($details);
             }
-        } elseif ( ! $details->blog_id || ! $details->site_id ) {
-            // Clear objects missing critical properties.
-            wp_cache_delete( $blog_id . $all, 'blog-details' );
-            unset($details);
         } else {
             return $details;
@@ -208 +204 @@
                     unset($details);
                 }
-            } elseif ( ! $details->blog_id || ! $details->site_id ) {
-                // Clear objects missing critical properties.
-                wp_cache_delete( $blog_id, 'blog-details' );
-                unset($details);
             } else {
                 return $details;
@@ -218 +210 @@
     }
 
-    if ( empty( $details ) || ! $details->blog_id || ! $details->site_id ) {
+    if ( empty($details) ) {
         $details = WP_Site::get_instance( $blog_id );
         if ( ! $details ) {