WordPress.org

Make WordPress Core

Changeset 37929


Ignore:
Timestamp:
06/30/2016 04:39:31 PM (3 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/ms-blogs.php

    r37918 r37929  
    184184                unset($details);
    185185            }
    186         } elseif ( ! $details->blog_id || ! $details->site_id ) {
    187             // Clear objects missing critical properties.
    188             wp_cache_delete( $blog_id . $all, 'blog-details' );
    189             unset($details);
    190186        } else {
    191187            return $details;
     
    208204                    unset($details);
    209205                }
    210             } elseif ( ! $details->blog_id || ! $details->site_id ) {
    211                 // Clear objects missing critical properties.
    212                 wp_cache_delete( $blog_id, 'blog-details' );
    213                 unset($details);
    214206            } else {
    215207                return $details;
     
    218210    }
    219211
    220     if ( empty( $details ) || ! $details->blog_id || ! $details->site_id ) {
     212    if ( empty($details) ) {
    221213        $details = WP_Site::get_instance( $blog_id );
    222214        if ( ! $details ) {
Note: See TracChangeset for help on using the changeset viewer.