Ticket #18910: ms-blogs.php.patch

www/wp-includes/ms-blogs.php

@@ -127 +127 @@
         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;