Changeset 10267

Timestamp:

09/16/2020 06:54:10 AM (4 years ago)

Author:

dd32

Message:

Plugin Directory: Redirect plugins to their canonical location, avoiding mixed case urls.

Fixes #5324.

File:

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

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

@@ -977 +977 @@
 
     /**
-     * Adjust the login URL to point back to whatever part of the support forums we're
+     * Adjust the login URL to point back to whatever part of the plugin directory we're
      * currently looking at. This allows the redirect to come back to the same place
      * instead of the main /support URL by default.
      */
     public function fix_login_url( $login_url, $redirect, $force_reauth ) {
-        // modify the redirect_to for the support forums to point to the current page
+        // modify the redirect_to for the plugin directory to point to the current page
         if ( 0 === strpos( $_SERVER['REQUEST_URI'], '/plugins' ) ) {
             // Note that this is not normal because of the code in /mu-plugins/wporg-sso/class-wporg-sso.php.
@@ -1004 +1004 @@
         return $login_url;
     }
-
 
     /**
@@ -1270 +1269 @@
      */
     function custom_redirects() {
+        global $wp_query;
+
         // Handle a redirect for /$plugin/$tab_name/ to /$plugin/#$tab_name.
         if ( get_query_var( 'redirect_plugin' ) && get_query_var( 'redirect_plugin_tab' ) ) {
@@ -1334 +1335 @@
         }
 
+        // Redirect mixed-case plugin names to the canonical location.
+        if (
+            get_query_var( 'name' ) && // A sanitized lowercase value is here
+            is_singular() &&
+            ! empty( $wp_query->query['name'] ) && // The raw value is available here.
+            get_query_var( 'name' ) != $wp_query->query['name']
+        ) {
+            $url = get_permalink();
+            if ( get_query_var( 'plugin_advanced' ) ) {
+                $url .= 'advanced/';
+            }
+
+            wp_safe_redirect( $url, 301 );
+            die();
+        }
+
         // If it's an old search query, handle that too.
         if ( 'search.php' == get_query_var( 'name' ) && isset( $_GET['q'] ) ) {
@@ -1382 +1399 @@
         }
 
-        // disable feeds
+        // Disable feeds
         if ( is_feed() ) {
             if ( isset( $_GET['feed'] ) ) {