Changeset 22108

Timestamp:

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

Author:

ryan

Message:

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

Location:

trunk

Files:

• wp-admin/includes/class-wp-importer.php (modified) (2 diffs)
• wp-admin/ms-delete-site.php (modified) (2 diffs)
• wp-includes/class-wp-xmlrpc-server.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/ms-blogs.php (modified) (2 diffs)
• wp-includes/ms-load.php (modified) (4 diffs)

trunk/wp-admin/includes/class-wp-importer.php

@@ -133 +133 @@
             }
             $blog_id = (int) $blog->blog_id;
-            // Restore global $current_blog
-            global $current_blog;
-            $current_blog = $blog;
         }
 
@@ -213 +210 @@
      */
     function is_user_over_quota() {
-        global $current_blog;
-
         if ( function_exists( 'upload_is_user_over_quota' ) ) {
             if ( upload_is_user_over_quota( 1 ) ) {

trunk/wp-admin/ms-delete-site.php

@@ -25 +25 @@
     }
 }
+
+$blog = get_blog_details();
 
 $title = __( 'Delete Site' );
@@ -73 +75 @@
         <?php wp_nonce_field( 'delete-blog' ) ?>
         <input type="hidden" name="action" value="deleteblog" />
-        <p><input id="confirmdelete" type="checkbox" name="confirmdelete" value="1" /> <label for="confirmdelete"><strong><?php printf( __( "I'm sure I want to permanently disable my site, and I am aware I can never get it back or use %s again." ), is_subdomain_install() ? $current_blog->domain : $current_blog->domain . $current_blog->path ); ?></strong></label></p>
+        <p><input id="confirmdelete" type="checkbox" name="confirmdelete" value="1" /> <label for="confirmdelete"><strong><?php printf( __( "I'm sure I want to permanently disable my site, and I am aware I can never get it back or use %s again." ), is_subdomain_install() ? $blog->domain : $blog->domain . $blog->path ); ?></strong></label></p>
         <?php submit_button( __( 'Delete My Site Permanently' ) ); ?>
     </form>

trunk/wp-includes/class-wp-xmlrpc-server.php

@@ -3661 +3661 @@
      */
     function _multisite_getUsersBlogs($args) {
-        global $current_blog;
+        $current_blog = get_blog_details();
+
         $domain = $current_blog->domain;
         $path = $current_blog->path . 'xmlrpc.php';

trunk/wp-includes/functions.php

@@ -3119 +3119 @@
  */
 function is_main_site( $blog_id = '' ) {
-    global $current_site, $current_blog;
-
-    if ( !is_multisite() )
+    global $current_site;
+
+    if ( ! is_multisite() )
         return true;
 
-    if ( !$blog_id )
-        $blog_id = $current_blog->blog_id;
+    if ( ! $blog_id )
+        $blog_id = get_current_blog_id();
 
     return $blog_id == $current_site->blog_id;

trunk/wp-includes/ms-blogs.php

@@ -119 +119 @@
  * @since MU
  *
- * @param int|string|array $fields A blog ID, a blog slug, or an array of fields to query against.
+ * @param int|string|array $fields A blog ID, a blog slug, or an array of fields to query against. Optional. If not specified the current blog ID is used.
  * @param bool $get_all Whether to retrieve all details or only the details in the blogs table. Default is true.
  * @return object Blog details.
  */
-function get_blog_details( $fields, $get_all = true ) {
+function get_blog_details( $fields = null, $get_all = true ) {
     global $wpdb;
 
@@ -167 +167 @@
         }
     } else {
-        if ( !is_numeric( $fields ) )
+        if ( ! $fields )
+            $blog_id = get_current_blog_id();
+        elseif ( ! is_numeric( $fields ) )
             $blog_id = get_id_from_blogname( $fields );
         else

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';