Index: src/wp-includes/ms-deprecated.php
===================================================================
--- src/wp-includes/ms-deprecated.php	(revision 41337)
+++ src/wp-includes/ms-deprecated.php	(working copy)
@@ -429,10 +429,14 @@
 
 	global $wpdb;
 
-	if ( ! $domain )
+	if ( ! $domain ) {
 		$network_id = get_current_network_id();
-	else
-		$network_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE domain = %s AND path = %s", $domain, $path ) );
+	} else {
+		$network = get_network_by_path( $domain, $path );
+		if ( $network ) {
+			$network_id = $network->id;
+		}
+	}
 
 	if ( $network_id )
 		return $wpdb->get_results( $wpdb->prepare( "SELECT u.ID, u.user_login, u.user_pass FROM $wpdb->users AS u, $wpdb->sitemeta AS sm WHERE sm.meta_key = 'admin_user_id' AND u.ID = sm.meta_value AND sm.site_id = %d", $network_id ), ARRAY_A );