Ticket #42072: 42072.4.diff

src/wp-includes/ms-functions.php

@@ -1356 +1356 @@
  */
 function domain_exists( $domain, $path, $network_id = 1 ) {
         $path = trailingslashit( $path );
-        $args = array(
-                'network_id' => $network_id,
-                'domain'     => $domain,
-                'path'       => $path,
-                'fields'     => 'ids',
-        );
-        $result = get_sites( $args );
-        $result = array_shift( $result );
+        $url = $domain . '/' . ltrim( $path, '/' );
+
+        $result = get_site_by( 'url', $url, $network_id );
+
+        if ( $result ) {
+                $result = $result->blog_id;
+        }
 
         /**
          * Filters whether a site name is taken.

tests/phpunit/tests/multisite/getSiteBy.php

@@ -27 +27 @@
                         'wordpress.org/'              => array( 'domain' => 'wordpress.org',     'path' => '/',     'site_id' => self::$network_ids['wordpress.org/'] ),
                         'foo.wordpress.org/'          => array( 'domain' => 'foo.wordpress.org', 'path' => '/',     'site_id' => self::$network_ids['wordpress.org/'] ),
                         'wordpress.org/foo/'          => array( 'domain' => 'wordpress.org',     'path' => '/foo/', 'site_id' => self::$network_ids['wordpress.org/'] ),
-                        'www.wordpress.org/'          => array( 'domain' => 'www.wordpress.org', 'path' => '/',     'site_id' => self::$network_ids['wordpress.org/'] ),
                         'www.wordpress.net/'          => array( 'domain' => 'www.wordpress.net', 'path' => '/',     'site_id' => self::$network_ids['www.wordpress.net/'] ),
                         'foo.wordpress.net/'          => array( 'domain' => 'foo.wordpress.net', 'path' => '/',     'site_id' => self::$network_ids['www.wordpress.net/'] ),
                         'www.wordpress.net/foo/'      => array( 'domain' => 'www.wordpress.net', 'path' => '/foo/', 'site_id' => self::$network_ids['www.wordpress.net/'] ),
@@ -37 +36 @@
                         $id = $factory->blog->create( $id );
                 }
                 unset( $id );
+
         }
 
         public static function wpTearDownAfterClass() {
@@ -170 +170 @@
                                 'www.wordpress.net/',
                         ),
                         array(
-                                'www.wordpress.org/',
-                                'www.wordpress.org/',
+                                'wordpress.org/',
+                                'wordpress.org/',
                         ),
                 );
         }