Changeset 11490

Timestamp:

01/31/2022 06:24:57 AM (3 years ago)

Author:

dd32

Message:

SSO: Always include the current URL as the redirect_to (unless specified differently) on login URLs.

See #6058.

File:

• sites/trunk/common/includes/wporg-sso/class-wporg-sso.php (modified) (2 diffs)

sites/trunk/common/includes/wporg-sso/class-wporg-sso.php

@@ -94 +94 @@
             if ( ! preg_match( '!wordpress\.org$!', $this->host ) ) {
                 $login_url = add_query_arg( 'from', $this->host, $login_url );
-
-                // Not all browsers send referers cross-origin, ensure that a redirect_to is set for this hostname.
-                if ( empty( $redirect_to ) ) {
-                    $redirect_to = 'https://' . $this->host . $_SERVER['REQUEST_URI'];
-                }
+            }
+
+            // Always include the redirect_to if not set, to avoid cross-origin redirect issues.
+            if ( empty( $redirect_to ) ) {
+                $redirect_to = 'https://' . $this->host . $_SERVER['REQUEST_URI'];
             }
 
@@ -107 +107 @@
 
             return $login_url;
-
         }