X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/fa11948979fd6a4ea5705dc613b239699a459db3..7f1521bf193b382565eb753043c161f4cb3fcda7:/wp-includes/ms-deprecated.php?ds=sidebyside

diff --git a/wp-includes/ms-deprecated.php b/wp-includes/ms-deprecated.php
index 30026a87..beae326f 100644
--- a/wp-includes/ms-deprecated.php
+++ b/wp-includes/ms-deprecated.php
@@ -86,7 +86,7 @@ function graceful_fail( $message ) {
 	$message = apply_filters( 'graceful_fail', $message );
 	$message_template = apply_filters( 'graceful_fail_template',
 '<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"><head profile="http://gmpg.org/xfn/11">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Error!</title>
 <style type="text/css">
@@ -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;
 	}
@@ -232,7 +236,6 @@ function get_most_active_blogs( $num = 10, $display = true ) {
  * @since MU
  * @deprecated 3.3.0
  * @deprecated Use wp_redirect()
- * @uses wpmu_admin_redirect_add_updated_param()
  *
  * @param string $url
  */
@@ -297,7 +300,6 @@ function wpmu_admin_redirect_add_updated_param( $url = '' ) {
  * @since MU
  * @deprecated 3.6.0
  * @deprecated Use get_user_by()
- * @uses get_user_by()
  *
  * @param string $string Either an email address or a login.
  * @return int
@@ -344,4 +346,4 @@ function get_blogaddress_by_domain( $domain, $path ) {
 		}
 	}
 	return esc_url_raw( $url );
-}
+}
\ No newline at end of file
