diff -r 657482482ccf www/wp-includes/ms-blogs.php
--- a/www/wp-includes/ms-blogs.php	Thu Oct 06 12:18:45 2011 -0500
+++ b/www/wp-includes/ms-blogs.php	Tue Oct 11 18:34:23 2011 -0500
@@ -127,17 +127,12 @@
 	if ( is_array($fields ) ) {
 		if ( isset($fields['blog_id']) ) {
 			$blog_id = $fields['blog_id'];
-		} elseif ( isset($fields['domain']) && isset($fields['path']) ) {
+		} elseif ( ! is_subdomain_install() && isset($fields['path']) ) {
 			$key = md5( $fields['domain'] . $fields['path'] );
 			$blog = wp_cache_get($key, 'blog-lookup');
 			if ( false !== $blog )
 				return $blog;
-			if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
-				$nowww = substr( $fields['domain'], 4 );
-				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) AND path = %s ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'], $fields['path'] ) );
-			} else {
-				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $fields['domain'], $fields['path'] ) );
-			}
+			$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE path = %s", $fields['path'] ) );
 			if ( $blog ) {
 				wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details');
 				$blog_id = $blog->blog_id;