From 7ddfbf589b45f2f5a2647d1bb92ffd250eb4163b Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremyfelt@git.wordpress.org>
Date: Thu, 30 Jun 2016 16:39:31 +0000
Subject: [PATCH] Multisite: Revert [37874].

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

See #36717.


git-svn-id: https://develop.svn.wordpress.org/trunk@37929 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/ms-blogs.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/wp-includes/ms-blogs.php b/src/wp-includes/ms-blogs.php
index cb1c89af57..5bf2678de8 100644
--- a/src/wp-includes/ms-blogs.php
+++ b/src/wp-includes/ms-blogs.php
@@ -183,10 +183,6 @@ function get_blog_details( $fields = null, $get_all = true ) {
 				wp_cache_delete( $blog_id . $all, 'blog-details' );
 				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;
 		}
@@ -207,17 +203,13 @@ function get_blog_details( $fields = null, $get_all = true ) {
 					wp_cache_delete( $blog_id, 'blog-details' );
 					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;
 			}
 		}
 	}
 
-	if ( empty( $details ) || ! $details->blog_id || ! $details->site_id ) {
+	if ( empty($details) ) {
 		$details = WP_Site::get_instance( $blog_id );
 		if ( ! $details ) {
 			// Set the full cache.