Changeset 8213

Timestamp:

02/07/2019 06:59:25 AM (6 years ago)

Author:

dd32

Message:

Support Forum: Override WP::handle_404() for Theme/Plugin/Review forum views when a matching plugin/theme is found.

Fixes #4072.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php (modified) (6 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php

@@ -59 +59 @@
             // Remove new topic form at the bottom of reviews forum.
             add_filter( 'bbp_get_template_part', array( $this, 'noop_reviews_forum_form_topic' ), 10, 3 );
+
+            // Tell WordPress not to 404 (before bbPress overrides it) so that Canonical can do it's job.
+            add_filter( 'pre_handle_404', array( $this, 'abort_wp_handle_404' ) );
         }
     }
@@ -394 +397 @@
         ||
             ( ! empty( $this->contributors ) && in_array( $user->user_nicename, $this->contributors ) )
-        || 
+        ||
             ( ! empty( $this->support_reps ) && in_array( $user->user_nicename, $this->support_reps ) )
-        || 
+        ||
             // Back-compat for support reps added before https://meta.trac.wordpress.org/changeset/5867,
             // can be removed once they are re-added via the Plugin Directory UI.
@@ -705 +708 @@
 
     /**
+     * Filter WP::handle_404() to not run on compat views, so as to allow Canonical to properly handle the request.
+     */
+    public function abort_wp_handle_404( $handled ) {
+        if ( $this->slug() ) {
+            // We've matched a term, so WordPress shouldn't 404 this request.
+            $handled = true;
+        }
+
+        return $handled;
+    }
+
+
+    /**
      * Add a subscribe/unsubscribe link to the compat views.
      */
@@ -899 +915 @@
                      FROM {$prefix}terms AS t
                      LEFT JOIN {$prefix}term_taxonomy AS tt ON tt.term_id = t.term_id
-                     LEFT JOIN {$prefix}term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id 
+                     LEFT JOIN {$prefix}term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id
                      WHERE tt.taxonomy = 'plugin_committers' AND tr.object_id = %d",
                      $plugin->ID
@@ -934 +950 @@
                  FROM {$prefix}terms AS t
                  LEFT JOIN {$prefix}term_taxonomy AS tt ON tt.term_id = t.term_id
-                 LEFT JOIN {$prefix}term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id 
+                 LEFT JOIN {$prefix}term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id
                  WHERE tt.taxonomy = 'plugin_contributors' AND tr.object_id = %d",
                  $plugin->ID
@@ -968 +984 @@
                  FROM {$prefix}terms AS t
                  LEFT JOIN {$prefix}term_taxonomy AS tt ON tt.term_id = t.term_id
-                 LEFT JOIN {$prefix}term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id 
+                 LEFT JOIN {$prefix}term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id
                  WHERE tt.taxonomy = 'plugin_support_reps' AND tr.object_id = %d",
                  $plugin->ID