Changeset 10564

Timestamp:

01/11/2021 01:43:43 AM (4 years ago)

Author:

dd32

Message:

Plugin Directory: When disabling RSS feeds, handle situations where redirect_canonical() has no canonical location for the request.

See [6855].
Fixes #5566.

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

@@ -1411 +1411 @@
         if ( is_feed() ) {
             if ( isset( $_GET['feed'] ) ) {
-                wp_redirect( esc_url_raw( remove_query_arg( 'feed' ) ), 301 );
+                wp_safe_redirect( esc_url_raw( remove_query_arg( 'feed' ) ), 301 );
                 die();
             }
+
             set_query_var( 'feed', '' );
-            redirect_canonical();
+
+            if ( ! redirect_canonical() ) {
+                // There exists no canonical location for this request according to `redirect_canonical()`.
+                if ( get_query_var( 's' ) ) {
+                    wp_safe_redirect( home_url( '/search/' . get_query_var('s')  . '/' ), 301 );
+                } else {
+                    // If all else fails, homepage.
+                    wp_safe_redirect( home_url( '/' ) );
+                }
+            }
+
             die();
         }