Changeset 11046 for sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/pending-profile.php

Timestamp:

06/21/2021 05:36:48 AM (3 years ago)

Author:

dd32

Message:

Login: When a user is logged in, or an account creation link has already been used, redirect the user more appropriately to a page explaining the issue.

This removes a "random" redirect on certain Login pages that would result in the user redirected to the WordPress.org homepage, or support forums, with no further explanation.

Fixes #5754.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/pending-profile.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/pending-profile.php

@@ -8 +8 @@
 $sso = WPOrg_SSO::get_instance();
 
- // Migrate to cookies.
+// Migrate to cookies.
 if ( !empty( $sso::$matched_route_params['profile_user'] ) ) {
     setcookie( 'wporg_profile_user', $sso::$matched_route_params['profile_user'], time()+DAY_IN_SECONDS, '/register/', 'login.wordpress.org', true, true );
@@ -21 +21 @@
 
 $pending_user = wporg_get_pending_user( $profile_user );
+
+// Already logged in.. Warn about duplicate accounts, etc.
+if ( is_user_logged_in() ) {
+    wp_safe_redirect( home_url( '/linkexpired/register-logged-in' ) );
+    exit;
+}
 
 $can_access = false;
@@ -37 +43 @@
 
 if ( $can_access && $pending_user['created']  ) {
-    wp_safe_redirect( 'https://wordpress.org/support/' );
+    wp_safe_redirect( home_url( '/linkexpired/account-created/' . urlencode( $pending_user['user_login'] ) ) );
     die();
 } elseif ( ! $can_access ) {