Changeset 18560

Timestamp:

08/17/2011 05:49:57 PM (13 years ago)

Author:

nacin

Message:

Instantiate some MS variables as objects before using them. Spaces not tabs for vertical alignment. Remove unnecessary conditional piece. props PeteMall, see #18049.

Location:

trunk/wp-includes

Files:

• ms-functions.php (modified) (1 diff)
• user.php (modified) (2 diffs)

trunk/wp-includes/ms-functions.php

@@ -20 +20 @@
     global $wpdb;
 
-    $stats['blogs'] = get_blog_count();
-    $stats['users'] = get_user_count();
+    $stats = array(
+        'blogs' => get_blog_count(),
+        'users' => get_user_count(),
+    );
 
     return $stats;

trunk/wp-includes/user.php

@@ -657 +657 @@
     if ( !is_multisite() ) {
         $blog_id = get_current_blog_id();
-        $blogs = array();
+        $blogs = array( $blog_id => new stdClass );
         $blogs[ $blog_id ]->userblog_id = $blog_id;
         $blogs[ $blog_id ]->blogname = get_option('blogname');
@@ -705 +705 @@
     foreach ( (array) $blogs as $blog_id ) {
         $blog = get_blog_details( $blog_id );
-        if ( $blog && isset( $blog->domain ) && ( $all == true || $all == false && ( $blog->archived == 0 && $blog->spam == 0 && $blog->deleted == 0 ) ) ) {
-            $blog_deets[ $blog_id ]->userblog_id    = $blog_id;
-            $blog_deets[ $blog_id ]->blogname       = $blog->blogname;
-            $blog_deets[ $blog_id ]->domain     = $blog->domain;
-            $blog_deets[ $blog_id ]->path           = $blog->path;
-            $blog_deets[ $blog_id ]->site_id        = $blog->site_id;
-            $blog_deets[ $blog_id ]->siteurl        = $blog->siteurl;
+        if ( $blog && isset( $blog->domain ) && ( $all || ( $blog->archived == 0 && $blog->spam == 0 && $blog->deleted == 0 ) ) ) {
+            $blog_deets[ $blog_id ] = new stdClass;
+            $blog_deets[ $blog_id ]->userblog_id = $blog_id;
+            $blog_deets[ $blog_id ]->blogname    = $blog->blogname;
+            $blog_deets[ $blog_id ]->domain      = $blog->domain;
+            $blog_deets[ $blog_id ]->path        = $blog->path;
+            $blog_deets[ $blog_id ]->site_id     = $blog->site_id;
+            $blog_deets[ $blog_id ]->siteurl     = $blog->siteurl;
         }
     }