Ticket #21837: 21837.diff

src/wp-includes/ms-blogs.php

@@ -124 +124 @@
                                 $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'] ) );
+                                $www = "www.{$fields['domain']}";
+                                $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) AND path = %s ORDER BY CHAR_LENGTH(domain) ASC", $fields['domain'], $www, $fields['path'] ) );
                         }
                         if ( $blog ) {
                                 wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details');
@@ -141 +142 @@
                                 $nowww = substr( $fields['domain'], 4 );
                                 $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'] ) );
                         } else {
-                                $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s", $fields['domain'] ) );
+                                $www = "www.{$fields['domain']}";
+                                $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) ORDER BY CHAR_LENGTH(domain) ASC", $fields['domain'], $www ) );
                         }
                         if ( $blog ) {
                                 wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details');