Changeset 9461

Timestamp:

02/04/2020 12:16:34 AM (5 years ago)

Author:

dd32

Message:

Login: Add a Canonical header to the login screens.

Fixes #5004.

Location:

sites/trunk

Files:

• common/includes/wporg-sso/wp-plugin.php (modified) (2 diffs)
• wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php (modified) (1 diff)

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

@@ -33 +33 @@
 
         /**
+         * Holds the route regex hit in `valid_sso_paths`
+         * @var bool|string
+         */
+        static $matched_route_regex = false;
+
+        /**
          * Holds any matched route params.
          * @var array
@@ -211 +217 @@
                 if ( ! preg_match( '!/wp-login\.php$!', $this->script ) ) {
                     // ... but not on its login screen.
-                    self::$matched_route = false;
+                    self::$matched_route        = false;
+                    self::$matched_route_regex  = false;
                     self::$matched_route_params = array();
                     foreach ( $this->valid_sso_paths as $route => $regex ) {
                         if ( preg_match( '!^' . $regex . '(?:[/?]{1,2}.*)?$!', $_SERVER['REQUEST_URI'], $matches ) ) {
-                            self::$matched_route = $route;
+                            self::$matched_route        = $route;
+                            self::$matched_route_regex  = $regex;
                             self::$matched_route_params = $matches;
                             break;

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php

@@ -355 +355 @@
 }
 add_action( 'login_purge_pending_registrations', 'wporg_login_purge_pending_registrations' );
+
+/**
+ * Add a canonical tag to the login screens.
+ */
+function wporg_login_canonical_link() {
+    $canonical = false;
+
+    // If the regular expression for this route is not matching, it's the canonical.
+    if ( false === stripos( WP_WPOrg_SSO::$matched_route_regex, '(' ) ) {
+        $canonical = site_url( WP_WPOrg_SSO::$matched_route_regex );
+    }
+
+    if ( $canonical ) {
+        printf( '<link rel="canonical" href="%s" />', esc_url( $canonical ) );
+    }
+}
+add_action( 'login_head', 'wporg_login_canonical_link' );
+add_action( 'wp_head', 'wporg_login_canonical_link' );