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

Timestamp:

07/01/2021 12:19:51 AM (5 years ago)

Author:

dd32

Message:

Support Forums: Revert to using the global WordPress.org/search system rather than using bbPress/WordPress search.

Reverts [11025], [11026], [11027].
See #5771.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/searchform.php (modified) (1 diff)

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

@@ -17 +17 @@
         <label for="s" class="screen-reader-text"><?php _ex( 'Search for:', 'label', 'wporg-forums' ); ?></label>
         <?php
-                $placeholder = _x( 'Search forums', 'placeholder', 'wporg-forums' );
-                $project     = false;
-                $tab         = 'support';
-
+                $tab = null;
                 if ( in_array( current_action(), [ 'bbp_template_before_pagination_loop', 'wporg_compat_before_single_view' ] ) ) {
                         $placeholder = _x( 'Search this forum', 'placeholder', 'wporg-forums' );
                         $project     = wporg_support_get_compat_object();
-                        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' );
+                        $project     = null;
                         $tab         = 'docs';
-                } elseif ( is_search() || bbp_is_search() ) {
-                        if ( !empty( $_GET['tab'] ) ) {
-                                $tab     = $_GET['tab'];
-                                $project = $_GET[ $_GET['tab'] ] ?? '';
-                        }
+                } else {
+                        $placeholder = _x( 'Search forums', 'placeholder', 'wporg-forums' );
+                        $project     = null;
                 }
         ?>
-        <input type="search" id="s" class="search-field" placeholder="<?php echo esc_attr( $placeholder ); ?>" value="<?php echo esc_attr( get_query_var( 's' ) ?: get_query_var( 'bbp_search' ) ) ?>" name="s" />
+        <input type="search" id="s" class="search-field" placeholder="<?php echo esc_attr( $placeholder ); ?>" value="<?php the_search_query(); ?>" name="s" />
         <?php if ( $project ) : ?>
-        <input type="hidden" name="<?php echo esc_attr( $tab ); ?>" value="<?php echo esc_attr( $project ); ?>" />
+        <input type="hidden" name="intext" value="<?php echo esc_attr( $project->prefixed_title ); ?>" />
         <?php endif; ?>
         <?php if ( $tab ) : ?>