Changeset 6661

Timestamp:

02/16/2018 07:25:45 AM (7 years ago)

Author:

obenland

Message:

SSO: Always pass locale information.

Makes sure the locale context remains maintained throughout the registration/login process.

H/t ocean90.
Fixes #1673.

File:

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

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

@@ -54 +54 @@
 
                 add_filter( 'pre_site_option_registration', array( $this, 'inherit_registration_option' ) );
+
+                add_filter( 'login_url', [$this, 'add_locale'], 21 );
+                add_filter( 'register_url', [$this, 'add_locale'], 21 );
+                add_filter( 'lostpassword_url', [$this, 'add_locale'], 21 );
             }
         }
@@ -323 +327 @@
 
         /**
+         * Adds a locale parameter to the passed URL.
+         *
+         * @param string $url The URL.
+         * @return string
+         */
+        public function add_locale( $url ) {
+            return add_query_arg( 'locale', get_locale(), $url );
+        }
+
+        /**
          * Redirects the user to her/his (support) profile.
          */