WordPress 4.2.4-scripts

[autoinstalls/wordpress.git] / wp-includes / ms-deprecated.php

diff --git a/wp-includes/ms-deprecated.php b/wp-includes/ms-deprecated.php
index ffd65ca8212169546bb01df9a1483b2cb633b0b4..beae326fe141b090d157332caeae6dec44e37f5d 100644 (file)
--- a/wp-includes/ms-deprecated.php
+++ b/wp-includes/ms-deprecated.php
@@ -166,20 +166,21 @@ function get_blog_list( $start = 0, $num = 10, $deprecated = '' ) {
        global $wpdb;
        $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 );
+       }
 }
 
 /**
@@ -193,15 +194,18 @@ function get_most_active_blogs( $num = 10, $display = true ) {
        $blogs = get_blog_list( 0, 'all', false ); // $blog_id -> $details
        if ( is_array( $blogs ) ) {
                reset( $blogs );
+               $most_active = array();
+               $blog_list = array();
                foreach ( (array) $blogs as $key => $details ) {
                        $most_active[ $details['blog_id'] ] = $details['postcount'];
                        $blog_list[ $details['blog_id'] ] = $details; // array_slice() removes keys!!
                }
                arsort( $most_active );
                reset( $most_active );
-               foreach ( (array) $most_active as $key => $details )
+               $t = array();
+               foreach ( (array) $most_active as $key => $details ) {
                        $t[ $key ] = $blog_list[ $key ];
-
+               }
                unset( $most_active );
                $most_active = $t;
        }