Changeset 7695 for sites/trunk/common/includes/wporg-sso/wp-plugin.php

Timestamp:

09/24/2018 03:45:23 AM (6 years ago)

Author:

dd32

Message:

Login: Allow query parameters on the /logout route. This is needed to support the locale switcher, and future custom redirection locations.

See #3821.
Fixes #3823.

File:

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

sites/trunk/common/includes/wporg-sso/wp-plugin.php

@@ -232 +232 @@
                                 return;
                             }
+                        } else if ( is_user_logged_in() && 'logout' == self::$matched_route ) {
+                            // No redirect, ask the user if they really want to log out.
+                            return;
                         } else if ( is_user_logged_in() ) {
-                            if ( preg_match( '!^' . $this->valid_sso_paths['logout'] . '/?$!', $_SERVER['REQUEST_URI'] ) ) {
-                                // No redirect, ask the user if they really want to log out.
-                                return;
-                            } else {
-                                // Otherwise, redirect to the login screen.
-                                $this->_redirect_to_profile();
-                            }
+                            // Otherwise, redirect to the their profile.
+                            $this->_redirect_to_profile();
                         }
                     } elseif ( ( is_admin() && is_super_admin() ) || 0 === strpos( $_SERVER['REQUEST_URI'], '/wp-json' ) || 0 === strpos( $_SERVER['REQUEST_URI'], '/xmlrpc.php' ) ) {