From cfab0413e67b83d969bd6612c895ecdb05dbfce4 Mon Sep 17 00:00:00 2001
From: Luke Carbis <luke@xwp.co>
Date: Tue, 14 Jun 2016 13:34:50 +1000
Subject: [PATCH] Change sites arrays to WP_Site objects

---
 classes/class-network.php            | 4 ++--
 classes/class-uninstall.php          | 2 +-
 connectors/class-connector-blogs.php | 2 +-
 includes/functions.php               | 5 ++++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/classes/class-network.php b/classes/class-network.php
index 2ba506e48..16a25cd76 100644
--- a/classes/class-network.php
+++ b/classes/class-network.php
@@ -395,9 +395,9 @@ public function list_table_filters( $filters ) {
 
 		// add all sites
 		foreach ( wp_stream_get_sites() as $blog ) {
-			$blog_data = get_blog_details( $blog );
+			$blog_data = get_blog_details( $blog->blog_id );
 
-			$blogs[ $blog['blog_id'] ] = array(
+			$blogs[ $blog->blog_id ] = array(
 				'label'    => $blog_data->blogname,
 				'disabled' => '',
 			);
diff --git a/classes/class-uninstall.php b/classes/class-uninstall.php
index 89d7d87d6..1f63fa02c 100644
--- a/classes/class-uninstall.php
+++ b/classes/class-uninstall.php
@@ -137,7 +137,7 @@ private function delete_all_options() {
 
 		// Delete options from each blog on network
 		foreach ( wp_stream_get_sites() as $blog ) {
-			$this->delete_blog_options( absint( $blog['blog_id'] ) );
+			$this->delete_blog_options( absint( $blog->blog_id ) );
 		}
 	}
 
diff --git a/connectors/class-connector-blogs.php b/connectors/class-connector-blogs.php
index 142c9a47c..41b0b0007 100644
--- a/connectors/class-connector-blogs.php
+++ b/connectors/class-connector-blogs.php
@@ -66,7 +66,7 @@ public function get_context_labels() {
 			$blogs = wp_stream_get_sites();
 
 			foreach ( $blogs as $blog ) {
-				$blog_details   = get_blog_details( $blog['blog_id'] );
+				$blog_details   = get_blog_details( $blog->blog_id );
 				$key            = sanitize_key( $blog_details->blogname );
 				$labels[ $key ] = $blog_details->blogname;
 			}
diff --git a/includes/functions.php b/includes/functions.php
index d2eb2cb69..d782f5bb9 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -95,7 +95,10 @@ function wp_stream_get_sites() {
 	if ( function_exists( 'get_sites' ) ) {
 		$sites = get_sites();
 	} else {
-		$sites = wp_get_sites();
+		$sites = array();
+		foreach ( wp_get_sites() as $site ) {
+			$sites = get_site( $site['blog_id'] );
+		}
 	}
 
 	return $sites;