Ticket #42091: 42091.diff

src/wp-includes/ms-blogs.php

@@ -79 +79 @@
  * @return int|null The site ID, or null if no site is found for the given slug.
  */
 function get_id_from_blogname( $slug ) {
-        $current_network = get_network();
-        $slug = trim( $slug, '/' );
+        $result = get_site_by( 'slug', $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 ) ) {
+        if ( ! $result ) {
                 return null;
         }
 
-        return array_shift( $site_ids );
+        return $result->id;
 }
 
 /**