Changeset 13142

Timestamp:

01/23/2024 05:40:36 AM (2 years ago)

Author:

dd32

Message:

Login / SSO: Don't end up in an infinite loop if wordpress.org/login is used.

This URL isn't directly used, but is supported through wp_redirect_admin_locations().

Fixes #7329.

File:

• sites/trunk/common/includes/wporg-sso/class-wporg-sso.php (modified) (1 diff)

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

@@ -134 +134 @@
             if ( ! empty( $redirect_to ) && $this->_is_valid_targeted_domain( $redirect_to ) ) {
                 $redirect_to = preg_replace( '/\/wp-(login|signup)\.php\??.*$/', '/', $redirect_to );
-                $login_url = add_query_arg( 'redirect_to', urlencode( $redirect_to ), $login_url );
+                $redirect_to = preg_replace( '/\/login(\.php|\/)?$/', '/', $redirect_to ); // Thanks to wp_redirect_admin_locations()
+                $login_url   = add_query_arg( 'redirect_to', urlencode( $redirect_to ), $login_url );
             }