Changeset 30982 for trunk/src/wp-includes/ms-deprecated.php

Timestamp:

12/20/2014 10:46:53 PM (12 years ago)

Author:

wonderboymusic

Message:

For clarity, initialize some arrays that previously were only assigned via short circuit in loops.

See #30799.

File:

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

trunk/src/wp-includes/ms-deprecated.php

@@ -167 +167 @@
         $blogs = $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' ORDER BY registered DESC", $wpdb->siteid), ARRAY_A );
 
+        $blog_list = array();
         foreach ( (array) $blogs as $details ) {
                 $blog_list[ $details['blog_id'] ] = $details;
                 $blog_list[ $details['blog_id'] ]['postcount'] = $wpdb->get_var( "SELECT COUNT(ID) FROM " . $wpdb->get_blog_prefix( $details['blog_id'] ). "posts WHERE post_status='publish' AND post_type='post'" );
         }
-        unset( $blogs );
-        $blogs = $blog_list;
-
-        if ( false == is_array( $blogs ) )
+
+        if ( ! $blog_list ) {
                 return array();
-
-        if ( $num == 'all' )
-                return array_slice( $blogs, $start, count( $blogs ) );
-        else
-                return array_slice( $blogs, $start, $num );
+        }
+
+        if ( $num == 'all' ) {
+                return array_slice( $blog_list, $start, count( $blog_list ) );
+        } else {
+                return array_slice( $blog_list, $start, $num );
+        }
 }