Ticket #20589: 20589.2.diff

src/wp-includes/ms-functions.php

@@ -1289 +1289 @@
  */
 function domain_exists($domain, $path, $site_id = 1) {
         global $wpdb;
+
+        $path = trailingslashit( $path );
+
         $result = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s AND site_id = %d", $domain, $path, $site_id) );
         /**
          * Filter whether a blogname is taken.

tests/phpunit/tests/ms.php

@@ -962 +962 @@
         }
 
         function _domain_exists_cb( $exists, $domain, $path, $site_id ) {
-                if ( 'foo' == $domain && 'bar' == $path )
+                if ( 'foo' == $domain && 'bar/' == $path )
                         return 1234;
                 else
                         return null;
@@ -984 +984 @@
                 $this->assertEquals( null, domain_exists( 'foo', 'baz' ) );
                 $this->assertEquals( null, domain_exists( 'bar', 'foo' ) );
 
+                // Make sure the same result is returned with or without a trailing slash
+                $this->assertEquals( domain_exists( 'foo', 'bar' ), domain_exists( 'foo', 'bar/' ) );
+
                 remove_filter( 'domain_exists', array( $this, '_domain_exists_cb' ), 10, 4 );
                 $this->assertEquals( null, domain_exists( 'foo', 'bar' ) );