Changeset 11027

Timestamp:

06/11/2021 05:56:31 AM (3 years ago)

Author:

dd32

Message:

Search: Allow searching regular bbPress forums, not just plugin/theme variants.

See #5771.

Location:

sites/trunk/wordpress.org/public_html/wp-content

Files:

• plugins/support-forums/inc/class-performance-optimizations.php (modified) (3 diffs)
• themes/pub/wporg-support/searchform.php (modified) (1 diff)

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

@@ -94 +94 @@
 
         $tab = $_GET['tab'] ?? 'support';
-        if ( ! in_array( $tab, [ 'support', 'docs', 'plugin', 'theme' ] ) ) {
+        if ( ! in_array( $tab, [ 'support', 'docs', 'plugin', 'theme', 'searchforum' ] ) ) {
             $tab = 'support';
         }
@@ -101 +101 @@
             case 'theme':
             case 'plugin':
+            case 'searchforum':
                 wp_safe_redirect( add_query_arg( $tab, $_GET[ $tab ], home_url( "/search/{$search_terms}/" ) ) );
                 exit;
@@ -151 +152 @@
                 ]
             ] );
+
+            add_filter( 'posts_where', array( $this, 'posts_in_last_year' ) );
+        } elseif ( ! empty( $_GET['searchforum'] ) ) {
+            $query->set( 'post_parent', (int) $_GET['searchforum'] );
 
             add_filter( 'posts_where', array( $this, 'posts_in_last_year' ) );

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/searchform.php

@@ -24 +24 @@
             $placeholder = _x( 'Search this forum', 'placeholder', 'wporg-forums' );
             $project     = wporg_support_get_compat_object();
-            $tab         = $project->type;
-            $project     = $project->post_name;
+            if ( $project ) {
+                $tab     = $project->type;
+                $project = $project->post_name;
+            } else {
+                // Specific forum.
+                $tab     = 'searchforum';
+                $project = bbp_get_forum_id();
+            }
         } elseif ( is_front_page() ) {
             $placeholder = _x( 'Search documentation', 'placeholder', 'wporg-forums' );