Changeset 6855

Timestamp:

03/10/2018 02:26:02 PM (7 years ago)

Author:

Otto42

Message:

Plugins: Disable feeds for plugin listings and comments

File:

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

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

@@ -41 +41 @@
         add_filter( 'pre_update_option_jetpack_options', array( $this, 'filter_jetpack_options' ) );
         add_action( 'template_redirect', array( $this, 'prevent_canonical_for_plugins' ), 9 );
-        add_action( 'template_redirect', array( $this, 'custom_redirects' ) );
+        add_action( 'template_redirect', array( $this, 'custom_redirects' ), 1 );
         add_filter( 'query_vars', array( $this, 'filter_query_vars' ) );
         add_filter( 'single_term_title', array( $this, 'filter_single_term_title' ) );
@@ -516 +516 @@
         remove_action( 'template_redirect', 'wp_redirect_admin_locations', 1000 );
 
+        // disable feeds
+        remove_action( 'wp_head', 'feed_links', 2 );
+        remove_action( 'wp_head', 'feed_links_extra', 3 );
+
         add_filter( 'get_term', array( __NAMESPACE__ . '\I18n', 'translate_term' ) );
         add_filter( 'the_content', array( $this, 'translate_post_content' ), 1, 2 );
@@ -1176 +1180 @@
         if ( get_query_var( 's' ) && isset( $_GET['s'] ) ) {
             wp_safe_redirect( site_url( '/search/' . urlencode( get_query_var( 's' ) ) . '/' ) );
+            die();
+        }
+
+        // disable feeds
+        if ( is_feed() ) {
+            if( isset( $_GET['feed'] ) ) {
+                wp_redirect( esc_url_raw( remove_query_arg( 'feed' ) ), 301 );
+                die();
+            }
+            set_query_var( 'feed', '' );
+            redirect_canonical();
+            die();
+        }
+
+        if ( is_comment_feed() ) {
+            wp_redirect( 'https://wordpress.org/plugins/', 301 );
             die();
         }