Commit 0a4b8f22 authored by Mark Jaquith's avatar Mark Jaquith
Browse files

Fix a sometimes notice in wpmu_current_site() 

props johnjamesjacoby. see #27003.
Built from https://develop.svn.wordpress.org/trunk@27275


git-svn-id: https://core.svn.wordpress.org/trunk@27131 1a063a9b-81f0-0310-95a4-ce76da25c4cd
parent 73fbd8a6

wp-includes/ms-load.php

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ function wpmu_current_site() { 
		$networks = $wpdb->get_col( "SELECT id FROM $wpdb->site LIMIT 2" );



		if ( count( $networks ) <= 1 ) {

			$current_site = wp_get_network( $networks[0]->id );

			$current_site = wp_get_network( $networks[0] );



			$current_site->blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id

				FROM $wpdb->blogs WHERE domain = %s AND path = %s",