Ticket #24760: 24760.patch

wp-includes/ms-functions.php

@@ -786 +786 @@
         }
 
         // Send email with activation link.
-        if ( !is_subdomain_install() || get_current_site()->id != 1 )
-                $activate_url = network_site_url("wp-activate.php?key=$key");
-        else
-                $activate_url = "http://{$domain}{$path}wp-activate.php?key=$key"; // @todo use *_url() API
+        $activate_url = network_site_url("wp-activate.php?key=$key");
 
         $activate_url = esc_url($activate_url);
         $admin_email = get_site_option( 'admin_email' );