From eb95f8ba518bda7eecf6e7df720c8a637a392aa0 Mon Sep 17 00:00:00 2001 From: Ron Rennick Date: Sun, 2 May 2010 21:34:11 +0000 Subject: [PATCH] strip www from subdomains in blog lookup, see #13104 git-svn-id: https://develop.svn.wordpress.org/trunk@14342 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/ms-blogs.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php index 66e84f72d6..a34bddddc6 100644 --- a/wp-includes/ms-blogs.php +++ b/wp-includes/ms-blogs.php @@ -89,7 +89,12 @@ function get_blog_details( $fields, $get_all = true ) { $blog = wp_cache_get($key, 'blog-lookup'); if ( false !== $blog ) return $blog; - $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $fields['domain'], $fields['path'] ) ); + if ( substr( $domain, 0, 4 ) == 'www.' ) { + $nowww = substr( $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'] ) ); + } if ( $blog ) { wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details'); $blog_id = $blog->blog_id; @@ -101,7 +106,12 @@ function get_blog_details( $fields, $get_all = true ) { $blog = wp_cache_get($key, 'blog-lookup'); if ( false !== $blog ) return $blog; - $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s", $fields['domain'] ) ); + if ( substr( $domain, 0, 4 ) == 'www.' ) { + $nowww = substr( $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'], $fields['path'] ) ); + } else { + $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s", $fields['domain'] ) ); + } if ( $blog ) { wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details'); $blog_id = $blog->blog_id;