Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/wp-activate.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
* @package WordPress
*/

define( 'WP_INSTALLING', true );
if ( isset( $_GET['new_blog'] ) ) {
define( 'WP_INSTALLING', true );
}

/** Sets up the WordPress Environment. */
require __DIR__ . '/wp-load.php';
Expand Down
4 changes: 2 additions & 2 deletions src/wp-includes/ms-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -968,9 +968,9 @@ function wpmu_signup_blog_notification(

// Send email with activation link.
if ( ! is_subdomain_install() || get_current_network_id() !== 1 ) {
$activate_url = network_site_url( "wp-activate.php?key=$key" );
$activate_url = network_site_url( "wp-activate.php?key=$key&new_blog=1" );
} else {
$activate_url = "http://{$domain}{$path}wp-activate.php?key=$key"; // @todo Use *_url() API.
$activate_url = "http://{$domain}{$path}wp-activate.php?key=$key&new_blog=1"; // @todo Use *_url() API.
}

$activate_url = esc_url( $activate_url );
Expand Down
Loading