Changeset 38457 for trunk/src/wp-includes/cache.php

Timestamp:

08/31/2016 04:55:01 AM (8 years ago)

Author:

wonderboymusic

Message:

Multisite: use get_current_blog_id() where applicable, in lieu of plucking the $blog_id global from outer space.

See #37699.

File:

• trunk/src/wp-includes/cache.php (modified) (1 diff)

trunk/src/wp-includes/cache.php

@@ -730 +730 @@
      *
      * @since 2.0.8
-     *
-     * @global int $blog_id Global blog ID.
      */
     public function __construct() {
-        global $blog_id;
-
         $this->multisite = is_multisite();
-        $this->blog_prefix =  $this->multisite ? $blog_id . ':' : '';
+        $this->blog_prefix =  $this->multisite ? get_current_blog_id() . ':' : '';