Ticket #7: 7.patch

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

@@ -277 +277 @@
                         $this->term = get_term_by( 'slug', $this->slug(), $this->taxonomy() );
 
                         // Add plugin- and theme-specific filters and actions.
-                        add_action( 'wporg_compat_view_sidebar', array( $this, 'do_view_sidebar' ) );
+                        add_action( 'wporg_compat_view_sidebar',       array( $this, 'do_view_sidebar' ) );
                         add_action( 'wporg_compat_before_single_view', array( $this, 'do_view_header' ) );
                         add_action( 'wporg_compat_before_single_view', array( $this, 'do_subscription_link' ), 11 );
+                        add_action( 'wporg_compat_before_single_view', array( $this, 'do_search_form' ), 11 );
 
                         // Add output filters and actions.
                         add_filter( 'bbp_get_view_link', array( $this, 'get_view_link' ), 10, 2 );
@@ -707 +708 @@
         }
 
         /**
+         * Display a project-specific search form in compat views.
+         */
+        function do_search_form() {
+                get_search_form();
+        }
+
+        /**
          * Term subscriptions use `get_term_link` for the redirect. This needs to be
          * filtered to redirect to the appropriate theme/plugin support view.
          *

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

@@ -86 +86 @@
                         $search_terms = get_search_query( false );
                 }
 
+                if ( isset( $_GET['intext'] ) ) {
+                        $search_terms .= ' intext:"' . esc_attr( $_GET['intext'] ) . '"';
+                }
+
                 if ( $search_terms ) {
                         $search_url = sprintf( 'https://wordpress.org/search/%s/?forums=1', urlencode( $search_terms ) );
                         $search_url = esc_url_raw( $search_url );

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

@@ -261 +261 @@
 }
 
 /**
+ * Get current plugin or theme object in plugin- or theme-specific views.
+ *
+ * @return object|null Plugin or theme object on success, false on failure.
+ */
+function wporg_support_get_compat_object() {
+        if ( ! class_exists( 'WordPressdotorg\Forums\Plugin' ) ) {
+                return null;
+        }
+
+        $object          = null;
+        $plugin_instance = WordPressdotorg\Forums\Plugin::get_instance();
+
+        if ( ! empty( $plugin_instance->plugins->plugin ) ) {
+                $object = $plugin_instance->plugins->plugin;
+
+                /* translators: %s: link to plugin support or review forum */
+                $object->prefixed_title = sprintf( __( 'Plugin: %s', 'wporg-forums' ), $object->post_title );
+                $object->type           = 'plugin';
+        } elseif ( ! empty( $plugin_instance->themes->theme ) ) {
+                $object = $plugin_instance->themes->theme;
+
+                /* translators: %s: link to theme support or review forum */
+                $object->prefixed_title = sprintf( __( 'Theme: %s', 'wporg-forums' ), $object->post_title );
+                $object->type           = 'theme';
+        }
+
+        return $object;
+}
+
+/**
  * Display a notice for messages caught in the moderation queue.
  */
 function wporg_support_add_moderation_notice() {

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

@@ -15 +15 @@
 
 <form role="search" method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
         <label for="s" class="screen-reader-text"><?php _ex( 'Search for:', 'label', 'wporg-forums' ); ?></label>
-        <input type="search" id="s" class="search-field" placeholder="<?php echo esc_attr_x( 'Search forums', 'placeholder', 'wporg-forums' ); ?>" value="<?php the_search_query(); ?>" name="s" />
+        <?php
+                if ( 'wporg_compat_before_single_view' === current_action() ) {
+                        $placeholder = _x( 'Search this forum', 'placeholder', 'wporg-forums' );
+                        $project     = wporg_support_get_compat_object();
+                } 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 the_search_query(); ?>" name="s" />
+        <?php if ( $project ) : ?>
+        <input type="hidden" name="intext" value="<?php echo esc_attr( $project->prefixed_title ); ?>" />
+        <?php endif; ?>
         <button class="button button-primary button-search"><i class="dashicons dashicons-search"></i><span class="screen-reader-text"><?php _e( 'Search forums', 'wporg-forums' ); ?></span></button>
 </form>