diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-activate.php
--- a/wp/wp-activate.php	Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-activate.php	Tue Dec 15 13:49:49 2020 +0100
@@ -9,9 +9,9 @@
 define( 'WP_INSTALLING', true );
 
 /** Sets up the WordPress Environment. */
-require( dirname( __FILE__ ) . '/wp-load.php' );
+require __DIR__ . '/wp-load.php';
 
-require( dirname( __FILE__ ) . '/wp-blog-header.php' );
+require __DIR__ . '/wp-blog-header.php';
 
 if ( ! is_multisite() ) {
 	wp_redirect( wp_registration_url() );
@@ -37,7 +37,7 @@
 if ( $key ) {
 	$redirect_url = remove_query_arg( 'key' );
 
-	if ( $redirect_url !== remove_query_arg( false ) ) {
+	if ( remove_query_arg( false ) !== $redirect_url ) {
 		setcookie( $activate_cookie, $key, 0, $activate_path, COOKIE_DOMAIN, is_ssl(), true );
 		wp_safe_redirect( $redirect_url );
 		exit;
@@ -46,18 +46,18 @@
 	}
 }
 
-if ( $result === null && isset( $_COOKIE[ $activate_cookie ] ) ) {
+if ( null === $result && isset( $_COOKIE[ $activate_cookie ] ) ) {
 	$key    = $_COOKIE[ $activate_cookie ];
 	$result = wpmu_activate_signup( $key );
 	setcookie( $activate_cookie, ' ', time() - YEAR_IN_SECONDS, $activate_path, COOKIE_DOMAIN, is_ssl(), true );
 }
 
-if ( $result === null || ( is_wp_error( $result ) && 'invalid_key' === $result->get_error_code() ) ) {
+if ( null === $result || ( is_wp_error( $result ) && 'invalid_key' === $result->get_error_code() ) ) {
 	status_header( 404 );
 } elseif ( is_wp_error( $result ) ) {
 	$error_code = $result->get_error_code();
 
-	if ( ! in_array( $error_code, $valid_error_codes ) ) {
+	if ( ! in_array( $error_code, $valid_error_codes, true ) ) {
 		status_header( 400 );
 	}
 }
@@ -68,7 +68,7 @@
 	$wp_object_cache->cache_enabled = false;
 }
 
-// Fix for page title
+// Fix for page title.
 $wp_query->is_404 = false;
 
 /**
@@ -117,6 +117,8 @@
 add_action( 'wp_head', 'wp_sensitive_page_meta' );
 
 get_header( 'wp-activate' );
+
+$blog_details = get_blog_details();
 ?>
 
 <div id="signup-content" class="widecolumn">
@@ -124,7 +126,7 @@
 	<?php if ( ! $key ) { ?>
 
 		<h2><?php _e( 'Activation Key Required' ); ?></h2>
-		<form name="activateform" id="activateform" method="post" action="<?php echo network_site_url( 'wp-activate.php' ); ?>">
+		<form name="activateform" id="activateform" method="post" action="<?php echo network_site_url( $blog_details->path . 'wp-activate.php' ); ?>">
 			<p>
 				<label for="key"><?php _e( 'Activation Key:' ); ?></label>
 				<br /><input type="text" name="key" id="key" value="" size="50" />
@@ -136,33 +138,33 @@
 
 		<?php
 	} else {
-		if ( is_wp_error( $result ) && in_array( $result->get_error_code(), $valid_error_codes ) ) {
+		if ( is_wp_error( $result ) && in_array( $result->get_error_code(), $valid_error_codes, true ) ) {
 			$signup = $result->get_error_data();
 			?>
 			<h2><?php _e( 'Your account is now active!' ); ?></h2>
 			<?php
 			echo '<p class="lead-in">';
-			if ( $signup->domain . $signup->path == '' ) {
+			if ( '' === $signup->domain . $signup->path ) {
 				printf(
-					/* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */
+					/* translators: 1: Login URL, 2: Username, 3: User email address, 4: Lost password URL. */
 					__( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
-					network_site_url( 'wp-login.php', 'login' ),
+					network_site_url( $blog_details->path . 'wp-login.php', 'login' ),
 					$signup->user_login,
 					$signup->user_email,
 					wp_lostpassword_url()
 				);
 			} else {
 				printf(
-					/* translators: 1: site URL, 2: username, 3: user email, 4: lost password URL */
+					/* translators: 1: Site URL, 2: Username, 3: User email address, 4: Lost password URL. */
 					__( 'Your site at %1$s is active. You may now log in to your site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
-					sprintf( '<a href="http://%1$s">%1$s</a>', $signup->domain ),
+					sprintf( '<a href="http://%1$s%2$s">%1$s%2$s</a>', $signup->domain, $blog_details->path ),
 					$signup->user_login,
 					$signup->user_email,
 					wp_lostpassword_url()
 				);
 			}
 			echo '</p>';
-		} elseif ( $result === null || is_wp_error( $result ) ) {
+		} elseif ( null === $result || is_wp_error( $result ) ) {
 			?>
 			<h2><?php _e( 'An error occurred during the activation' ); ?></h2>
 			<?php if ( is_wp_error( $result ) ) : ?>
@@ -181,22 +183,26 @@
 			</div>
 
 			<?php
-			if ( $url && $url != network_home_url( '', 'http' ) ) :
+			if ( $url && network_home_url( '', 'http' ) !== $url ) :
 				switch_to_blog( (int) $result['blog_id'] );
 				$login_url = wp_login_url();
 				restore_current_blog();
 				?>
 				<p class="view">
 				<?php
-					/* translators: 1: site URL, 2: login URL */
+					/* translators: 1: Site URL, 2: Login URL. */
 					printf( __( 'Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>' ), $url, esc_url( $login_url ) );
 				?>
 				</p>
 			<?php else : ?>
 				<p class="view">
 				<?php
-					/* translators: 1: login URL, 2: network home URL */
-					printf( __( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url( 'wp-login.php', 'login' ), network_home_url() );
+					printf(
+						/* translators: 1: Login URL, 2: Network home URL. */
+						__( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ),
+						network_site_url( $blog_details->path . 'wp-login.php', 'login' ),
+						network_home_url( $blog_details->path )
+					);
 				?>
 				</p>
 				<?php