Changeset 41743

Timestamp:

10/04/2017 06:44:36 PM (7 years ago)

Author:

jeremyfelt

Message:

Multisite: Use get_site_by() in get_id_from_blogname().

Fixes #42091.

File:

• trunk/src/wp-includes/ms-blogs.php (modified) (2 diffs)

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

@@ -71 +71 @@
 
 /**
- * Retrieves a sites ID given its (subdomain or directory) slug.
+ * Retrieves a site's ID given its (subdomain or directory) slug.
  *
  * @since MU (3.0.0)
  * @since 4.7.0 Converted to use get_sites().
+ * @since 4.9.0 Converted to use get_site_by().
  *
  * @param string $slug A site's slug.
@@ -80 +81 @@
  */
 function get_id_from_blogname( $slug ) {
-    $current_network = get_network();
-    $slug = trim( $slug, '/' );
-
-    if ( is_subdomain_install() ) {
-        $domain = $slug . '.' . preg_replace( '|^www\.|', '', $current_network->domain );
-        $path = $current_network->path;
-    } else {
-        $domain = $current_network->domain;
-        $path = $current_network->path . $slug . '/';
-    }
-
-    $site_ids = get_sites( array(
-        'number' => 1,
-        'fields' => 'ids',
-        'domain' => $domain,
-        'path' => $path,
-    ) );
-
-    if ( empty( $site_ids ) ) {
+    $result = get_site_by( 'slug', $slug );
+
+    if ( ! $result ) {
         return null;
     }
 
-    return array_shift( $site_ids );
+    return $result->id;
 }