Changeset 36393 for trunk/src/wp-includes/ms-blogs.php

Timestamp:

01/25/2016 09:51:01 PM (11 years ago)

Author:

jeremyfelt

Message:

Multisite: Introduce the WP_Site class.

• A WP_Site object initially matches a row from wp_blogs.
• A site can be retrieved by its ID through WP_Site::get_instance().
• Adds sites to the global cache group and captures instance lookups.
• The multisite bootstrap now ensures $current_blog is an instance of WP_Site.

Props johnjamesjacoby, jeremyfelt.
See #32450.

File:

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

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

@@ -211 +211 @@
 
         if ( empty($details) ) {
-                $details = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE blog_id = %d /* get_blog_details */", $blog_id ) );
+                $details = WP_Site::get_instance( $blog_id );
                 if ( ! $details ) {
                         // Set the full cache.
@@ -217 +217 @@
                         return false;
                 }
+        }
+
+        if ( ! $details instanceof WP_Site ) {
+                $details = new WP_Site( $details );
         }
 
@@ -443 +447 @@
         $domain_path_key = md5( $blog->domain . $blog->path );
 
+        wp_cache_delete( $blog_id, 'sites' );
         wp_cache_delete( $blog_id , 'blog-details' );
         wp_cache_delete( $blog_id . 'short' , 'blog-details' );
@@ -656 +661 @@
                                 wp_cache_add_global_groups( $global_groups );
                         } else {
-                                wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks' ) );
+                                wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites' ) );
                         }
                         wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );