Changeset 6676

Timestamp:

02/17/2018 12:14:14 PM (7 years ago)

Author:

ocean90

Message:

WordPress.org SSO: Don't append the current locale if on SSO host.

See #1673.

Location:

sites/trunk/common/includes/wporg-sso

Files:

• class-wporg-sso.php (modified) (2 diffs)
• wp-plugin.php (modified) (2 diffs)

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

@@ -41 +41 @@
         */
         public function add_allowed_redirect_host( $hosts ) {
-            if ( self::SSO_HOST === $this->host ) {
+            if ( $this->is_sso_host() ) {
                 // If on the SSO host, add the requesting source (eg: make.wordpress.org), if within our bounds
                 $url  = parse_url( $this->_get_safer_redirect_to() );
@@ -89 +89 @@
         public function has_host() {
             return ( ! empty( $this->host ) );
+        }
+
+        /**
+         * Whether the current host is the SSO host.
+         *
+         * @return bool True if current host is the SSO host, false if not.
+         */
+        public function is_sso_host() {
+            return self::SSO_HOST === $this->host;
         }
 

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

@@ -55 +55 @@
                 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 );
+                if ( ! $this->is_sso_host() ) {
+                    add_filter( 'login_url', [ $this, 'add_locale' ], 21 );
+                    add_filter( 'register_url', [ $this, 'add_locale' ], 21 );
+                    add_filter( 'lostpassword_url', [ $this, 'add_locale' ], 21 );
+                }
             }
         }
@@ -162 +164 @@
                 $this->_safe_redirect( add_query_arg( 'redirect_to', urlencode( $redirect_req ), $this->sso_signup_url ) );
 
-            } elseif ( self::SSO_HOST !== $this->host ) {
+            } elseif ( ! $this->is_sso_host() ) {
                 // If we're not on the SSO host
                 if ( preg_match( '!/wp-login\.php$!', $this->script ) ) {