Changeset 6801

Timestamp:

02/28/2018 01:44:53 AM (9 years ago)

Author:

SergeyBiryukov

Message:

Plugin Directory: In ::fix_login_url():

• Only adjust the login URL for Single Sign-On (SSO) plugin if the plugin is active, use the normal redirect_to method otherwise.
• Use $_SERVER['HTTP_HOST'] instead of hardcoded wordpress.org domain.

Merges [4944] from support forums.
See #3108.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php

@@ -886 +886 @@
                         // parse_url is used here to remove any additional query args from the REQUEST_URI before redirection
                         // The SSO code handles the urlencoding of the redirect_to parameter
-                        $url_parts       = parse_url( 'https://wordpress.org' . $_SERVER['REQUEST_URI'] );
+                        $url_parts       = parse_url( set_url_scheme( 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] ) );
                         $constructed_url = $url_parts['scheme'] . '://' . $url_parts['host'] . ( isset( $url_parts['path'] ) ? $url_parts['path'] : '' );
-                        $login_url       = $constructed_url;
+
+                        if ( class_exists( 'WPOrg_SSO' ) ) {
+                                $login_url = $constructed_url;
+                        } else {
+                                $login_url = add_query_arg( 'redirect_to', urlencode( $constructed_url ), $login_url );
+                        }
                 }
                 return $login_url;