Ticket #38175: 38175.diff

src/wp-includes/ms-blogs.php

@@ -72 +72 @@
 }
 
 /**
- * Given a blog's (subdomain or directory) slug, retrieve its id.
+ * Retrieves a sites ID given its (subdomain or directory) slug.
  *
  * @since MU
+ * @since 4.7.0 Converted to use get_sites().
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @param string $slug
- * @return int A blog id
+ * @param string $slug A site's slug.
+ * @return int|null The site ID, or null if no site is found for the given slug.
  */
 function get_id_from_blogname( $slug ) {
-        global $wpdb;
-
         $current_site = get_current_site();
         $slug = trim( $slug, '/' );
 
-        $blog_id = wp_cache_get( 'get_id_from_blogname_' . $slug, 'blog-details' );
-        if ( $blog_id )
-                return $blog_id;
-
         if ( is_subdomain_install() ) {
                 $domain = $slug . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
                 $path = $current_site->path;
@@ -99 +92 @@
                 $path = $current_site->path . $slug . '/';
         }
 
-        $blog_id = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM {$wpdb->blogs} WHERE domain = %s AND path = %s", $domain, $path) );
-        wp_cache_set( 'get_id_from_blogname_' . $slug, $blog_id, 'blog-details' );
-        return $blog_id;
+        $site_ids = get_sites( array(
+                'number' => 1,
+                'fields' => 'ids',
+                'domain' => $domain,
+                'path' => $path,
+        ) );
+
+        if ( empty( $site_ids ) ) {
+                return null;
+        }
+
+        return array_shift( $site_ids );
 }
 
 /**
@@ -453 +455 @@
         wp_cache_delete(  $domain_path_key, 'blog-lookup' );
         wp_cache_delete( 'current_blog_' . $blog->domain, 'site-options' );
         wp_cache_delete( 'current_blog_' . $blog->domain . $blog->path, 'site-options' );
-        wp_cache_delete( 'get_id_from_blogname_' . trim( $blog->path, '/' ), 'blog-details' );
         wp_cache_delete( $domain_path_key, 'blog-id-cache' );
 
         /**

tests/phpunit/tests/multisite/site.php

@@ -87 +87 @@
 
                 $this->assertEquals( $details, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
 
-                // get_id_from_blogname(), see #20950
-                $this->assertEquals( $blog_id, get_id_from_blogname( $details->path ) );
-                $this->assertEquals( $blog_id, wp_cache_get( 'get_id_from_blogname_' . trim( $details->path, '/' ), 'blog-details' ) );
-
                 // get_blogaddress_by_name()
                 $this->assertEquals( 'http://' . $details->domain . $details->path, get_blogaddress_by_name( trim( $details->path, '/' ) ) );
 
@@ -138 +134 @@
                 // Delete the site without forcing a table drop.
                 wpmu_delete_blog( $blog_id, false );
 
-                $this->assertEquals( false, wp_cache_get( 'get_id_from_blogname_' . trim( $details->path, '/' ), 'blog-details' ) );
                 $this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );
                 $this->assertEquals( false, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
                 $this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );
@@ -177 +172 @@
                 // Delete the site and force a table drop.
                 wpmu_delete_blog( $blog_id, true );
 
-                $this->assertEquals( false, wp_cache_get( 'get_id_from_blogname_' . trim( $details->path, '/' ), 'blog-details' ) );
                 $this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );
                 $this->assertEquals( false, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
                 $this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );
@@ -216 +210 @@
                 // Delete the site and force a table drop.
                 wpmu_delete_blog( $blog_id, true );
 
-                $this->assertEquals( false, wp_cache_get( 'get_id_from_blogname_' . trim( $details->path, '/' ), 'blog-details' ) );
                 $this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );
                 $this->assertEquals( false, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
                 $this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );