Changeset 3278

Timestamp:

05/31/2016 07:44:10 PM (10 years ago)

Author:

coffee2code

Message:

developer.wordpress.org: Unset search filter checkboxes if no filters were explicitly set.

The behavior had gotten undone during recent search-related changes.

Props keesiemeijer for initial patch.
See #1671.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer

Files:

• inc/search.php (modified) (2 diffs)
• searchform.php (modified) (1 diff)

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

@@ -25 +25 @@
                 add_filter( 'posts_orderby', array( __CLASS__, 'search_posts_orderby' ), 10, 2 );
                 add_filter( 'the_posts',     array( __CLASS__, 'rerun_empty_exact_search' ), 10, 2 );
+                add_filter( 'query_vars',    array( __CLASS__, 'default_qv_empty_post_type_search' ) );
+        }
+
+        /**
+         * Add query var to indicate if no post type filters were explicitly used for
+         * a search.
+         *
+         * Defaults the query var 'empty_post_type_search' to false. It is potentially
+         * set to true elsewhere.
+         *
+         * @param array $public_query_vars The array of whitelisted query variables.
+         * @return array
+         */
+        public static function default_qv_empty_post_type_search( $public_query_vars ) {
+                $public_query_vars['empty_post_type_search'] = false;
+                return $public_query_vars;
         }
 
@@ -66 +82 @@
 
                 if ( ! $qv_post_types ) {
+                        // Record the fact no post types were explicitly supplied.
+                        $query->set( 'empty_post_type_search', true );
+
                         // Not a handbook page, or exact search, or filters used.
                         // Fallback to parsed post types.

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

@@ -62 +62 @@
                                 
                                 $qv_post_type = array_filter( (array) get_query_var( 'post_type' ) );   
+                                $no_filters   = get_query_var( 'empty_post_type_search' );
 
-                                if ( ! is_search() || in_array( 'any', $qv_post_type ) ) {
-                                        // no filters used
+                                if ( ! is_search() || in_array( 'any', $qv_post_type ) || $no_filters ) {
+                                        // No filters used.
                                         $qv_post_type = array();
                                 }