Changeset 38659

Timestamp:

09/27/2016 06:17:23 PM (8 years ago)

Author:

jeremyfelt

Message:

Multisite: Use get_sites() instead of a database lookup in get_id_from_blogname().

Because queries generated via get_sites() are cached, we can remove the get_id_from_blogname cache key.

Props flixos90.
Fixes #38175.

Location:

trunk

Files:

• src/wp-includes/ms-blogs.php (modified) (3 diffs)
• tests/phpunit/tests/multisite/site.php (modified) (4 diffs)

trunk/src/wp-includes/ms-blogs.php

@@ -73 +73 @@
 
 /**
- * Given a blog's (subdomain or directory) slug, retrieve its id.
- *
- * @since MU
- *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @param string $slug
- * @return int A blog id
+ * Retrieves a sites ID given its (subdomain or directory) slug.
+ *
+ * @since MU
+ * @since 4.7.0 Converted to use get_sites().
+ *
+ * @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() ) {
@@ -100 +93 @@
     }
 
-    $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 );
 }
 
@@ -454 +456 @@
     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' );
 

trunk/tests/phpunit/tests/multisite/site.php

@@ -88 +88 @@
         $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, '/' ) ) );
@@ -139 +135 @@
         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' ) );
@@ -178 +173 @@
         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' ) );
@@ -217 +211 @@
         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' ) );