Changeset 38231

Timestamp:

08/09/2016 04:19:58 PM (8 years ago)

Author:

jeremyfelt

Message:

Multisite: Use get_current_blog_id() in get_site() for current site.

The global $current_blog is not switched in switch_to_blog() and can
not be used to properly retrieve current switched site information.

Merge of [38217] to the 4.6 branch.

Props ocean90 for review.
Fixes #37607.

Location:

branches/4.6

Files:

• src/wp-includes/ms-blogs.php (modified) (1 diff)
• tests/phpunit/tests/multisite/getSite.php (added)

branches/4.6/src/wp-includes/ms-blogs.php

@@ -479 +479 @@
  * @since 4.6.0
  *
- * @global WP_Site $current_blog The current site.
- *
  * @param WP_Site|int|null $site Optional. Site to retrieve. Default is the current site.
  * @return WP_Site|null The site object or null if not found.
  */
 function get_site( &$site = null ) {
-    global $current_blog;
-    if ( empty( $site ) && isset( $current_blog ) ) {
-        $site = $current_blog;
+    if ( empty( $site ) ) {
+        $site = get_current_blog_id();
     }