Changeset 10233

Timestamp:

09/03/2020 02:14:02 AM (6 years ago)

Author:

dd32

Message:

Plugin Directory: Search: When searches are performed from /browse/block/ limit the searches to the plugins in that section (block plugins).

This is mostly for debugging and to visually see any search modifications easier.

See ​https://github.com/WordPress/gutenberg/issues/24910
See #2753.

Location:

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

Files:

• plugins/plugin-directory/class-plugin-directory.php (modified) (2 diffs)
• themes/pub/wporg-plugins/search.php (modified) (1 diff)
• themes/pub/wporg-plugins/searchform.php (modified) (1 diff)

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

@@ -1191 +1191 @@
                 $vars[] = 'plugin_advanced';
                 $vars[] = 'geopattern_icon';
+                $vars[] = 'block_search';
 
                 // Remove support for any query vars the Plugin Directory doesn't support/need.
@@ -1338 +1339 @@
                 // New-style search links.
                 if ( get_query_var( 's' ) && isset( $_GET['s'] ) ) {
-                        wp_safe_redirect( site_url( '/search/' . urlencode( get_query_var( 's' ) ) . '/' ), 301 );
+                        $url = site_url( '/search/' . urlencode( get_query_var( 's' ) ) . '/' );
+                        if ( get_query_var( 'block_search' ) ) {
+                                $url = add_query_arg( 'block_search', get_query_var( 'block_search' ), $url );
+                        }
+
+                        wp_safe_redirect( $url, 301 );
                         die();
                 }

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/search.php

@@ -25 +25 @@
                                         ?>
                                 </h1>
+                                <?php
+                                if ( get_query_var( 'block_search' ) ) {
+                                        printf(
+                                                /* translators: %s: Search URL */
+                                                '<p>' . __( 'Searching the block directory. <a href="%s">Search all plugins</a>.', 'wporg-plugins' ) . '</p>',
+                                                remove_query_arg( 'block_search' )
+                                        );
+                                }
+                                ?>
                         </header><!-- .page-header -->
 

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

@@ -12 +12 @@
         <label for="s" class="screen-reader-text"><?php echo esc_html_x( 'Search for:', 'label', 'wporg-plugins' ); ?></label>
         <input type="search" id="s" class="search-field" placeholder="<?php echo esc_attr_x( 'Search plugins', 'placeholder', 'wporg-plugins' ); ?>" value="<?php the_search_query(); ?>" name="s" />
+        <?php if ( get_query_var( 'block_search' ) || 'block' === get_query_var( 'browse' ) ) : ?>
+                <input type="hidden" value="1" name="block_search" />
+        <?php endif; ?>
         <button class="button button-primary button-search"><i class="dashicons dashicons-search"></i><span class="screen-reader-text"><?php esc_html_e( 'Search plugins', 'wporg-plugins' ); ?></span></button>
 </form>