sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Multisite: Revert [37874].

Browse Source 
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
This commit is contained in:
Jeremy Felt 2016-06-30 16:39:31 +00:00
parent 4868cc600a
commit 7ddfbf589b
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wp-includes/ms-blogs.php
View File

@ -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.