Changeset 22108 for trunk/wp-includes/ms-load.php

Timestamp:

10/04/2012 12:40:09 PM (13 years ago)

Author:

ryan

Message:

Reduce use of global. Use get_blog_details() instead. fixes #22090

File:

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

trunk/wp-includes/ms-load.php

@@ -70 +70 @@
  */
 function ms_site_check() {
-    global $wpdb, $current_blog;
+    global $wpdb;
+
+    $blog = get_blog_details();
 
     // Allow short-circuiting
@@ -81 +83 @@
         return true;
 
-    if ( '1' == $current_blog->deleted ) {
+    if ( '1' == $blog->deleted ) {
         if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) )
             return WP_CONTENT_DIR . '/blog-deleted.php';
@@ -88 +90 @@
     }
 
-    if ( '2' == $current_blog->deleted ) {
+    if ( '2' == $blog->deleted ) {
         if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) )
             return WP_CONTENT_DIR . '/blog-inactive.php';
@@ -95 +97 @@
     }
 
-    if ( $current_blog->archived == '1' || $current_blog->spam == '1' ) {
+    if ( $blog->archived == '1' || $blog->spam == '1' ) {
         if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) )
             return WP_CONTENT_DIR . '/blog-suspended.php';