Ticket #37102: 37102.diff

src/wp-includes/ms-blogs.php

@@ -443 +443 @@
  *
  * @since 3.5.0
  *
- * @param WP_Site $blog The blog details as returned from get_blog_details()
+ * @param WP_Site $blog The site object to be cleared from cache.
  */
 function clean_blog_cache( $blog ) {
         $blog_id = $blog->blog_id;

src/wp-includes/ms-deprecated.php

@@ -19 +19 @@
  *
  * @since MU
  * @deprecated 3.1.0 Use get_site()
- * @see get_blog_details()
+ * @see get_site()
  *
- * @return int Current site ID.
+ * @return WP_Site Current site object.
  */
 function get_dashboard_blog() {
     _deprecated_function( __FUNCTION__, '3.1.0' );

src/wp-includes/ms-functions.php

@@ -1762 +1762 @@
  *
  * WordPress MS stores a blog's post count as an option so as
  * to avoid extraneous COUNTs when a blog's details are fetched
- * with get_blog_details(). This function is called when posts
- * are published or unpublished to make sure the count stays current.
+ * with get_site(). This function is called when posts are published
+ * or unpublished to make sure the count stays current.
  *
  * @since MU
  *

src/wp-includes/ms-load.php

@@ -211 +211 @@
 
         /*
          * @todo
-         * get_blog_details(), caching, etc. Consider alternative optimization routes,
+         * caching, etc. Consider alternative optimization routes,
          * perhaps as an opt-in for plugins, rather than using the pre_* filter.
          * For example: The segments filter can expand or ignore paths.
          * If persistent caching is enabled, we could query the DB for a path <> '/'
@@ -243 +243 @@
         $site = array_shift( $result );
 
         if ( $site ) {
-                // @todo get_blog_details()
                 return $site;
         }