Ticket #2089: 2089.patch

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

@@ -1322 +1322 @@
                 $post_types = get_parsed_post_types();
                 $taxonomies = array( 'wp-parser-since', 'wp-parser-package', 'wp-parser-source-file' );
 
-                return ! is_search() && ( is_singular( $post_types ) || is_post_type_archive( $post_types ) || is_tax( $taxonomies ) || get_query_var( 'is_handbook' ) );
+                return ! ( is_search() || is_404() ) && ( is_singular( $post_types ) || is_post_type_archive( $post_types ) || is_tax( $taxonomies ) || get_query_var( 'is_handbook' ) );
         }
 
         /**

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

@@ -11 +11 @@
                 return;
         }
 
-        var form = $( '.searchform' ).not(".searchform-handbook");
+        var form = $( '.searchform-filtered');
         if ( ! form.length ) {
                 return;
         }

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

@@ -5 +5 @@
  * @package wporg-developer
  */
 ?>
-<div class="search-section section clear <?php if ( ! ( is_page( 'reference' ) || is_search() ) ) { echo 'hide-if-js'; } ?>">
+<div class="search-section section clear <?php if ( ! ( is_page( 'reference' ) || is_search() || is_404() ) ) { echo 'hide-if-js'; } ?>">
 
 <?php if ( is_search() ) { ?>
 
@@ -37 +37 @@
                 $is_handbook = get_query_var( 'is_handbook' );
                 $search_url  = get_query_var( 'current_handbook_home_url' );
                 $search_url  = $search_url ? $search_url : home_url( '/' );
-                $form_class  = $is_handbook ? ' searchform-handbook' : '';
+                $filters     = ! ( $is_handbook || is_404() );
+                $form_class  = ( $filters ) ? ' searchform-filtered' : '';
         ?>
 
         <form role="search" method="get" class="searchform<?php echo esc_attr( $form_class ); ?>" action="<?php echo esc_url( $search_url ); ?>">
@@ -49 +50 @@
                 <input type="submit" class="shiny-blue search-submit" value="<?php echo esc_attr_x( 'Search', 'submit button', 'wporg' ); ?>">
                 </div>
 
-        <?php if ( ! $is_handbook ) : ?>
+        <?php if ( $filters ) : ?>
 
                 <div class="search-post-type">
                         <span><?php _e( 'Filter by type:', 'wporg' ); ?></span>