WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Multisite: Revert [37874]. 

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

See #36717.

Built from https://develop.svn.wordpress.org/trunk@37929


git-svn-id: http://core.svn.wordpress.org/trunk@37870 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Jeremy Felt 2016-06-30 16:40:28 +00:00
parent 48ca588a6c
commit f4d46f0235
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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' ); wp_cache_delete( $blog_id . $all, 'blog-details' );
unset($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 { } else {
return $details; return $details;
} }
@ -207,17 +203,13 @@ function get_blog_details( $fields = null, $get_all = true ) {
wp_cache_delete( $blog_id, 'blog-details' ); wp_cache_delete( $blog_id, 'blog-details' );
unset($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 { } else {
return $details; return $details;
} }
} }
} }
if ( empty( $details ) || ! $details->blog_id || ! $details->site_id ) { if ( empty($details) ) {
$details = WP_Site::get_instance( $blog_id ); $details = WP_Site::get_instance( $blog_id );
if ( ! $details ) { if ( ! $details ) {
// Set the full cache. // Set the full cache.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.6-beta1-37928'; $wp_version = '4.6-beta1-37929';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.