Ticket #21296: 21296.patch

wp-admin/includes/ajax-actions.php

@@ -1440 +1440 @@
                 wp_die();
 
         if ( !empty($_POST['post_type']) && in_array( $_POST['post_type'], get_post_types() ) )
-                $what = $_POST['post_type'];
+                $what = sprintf("post_type = '%s'", $_POST['post_type']);
+        elseif ($_POST['post_type'] == 'any')
+                $what = '1=1';
         else
-                $what = 'post';
+                $what = "post_type = 'post'";
 
         $s = stripslashes($_POST['ps']);
         preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches);
@@ -1458 +1460 @@
         if ( count($search_terms) > 1 && $search_terms[0] != $s )
                 $search .= " OR ($wpdb->posts.post_title LIKE '%{$term}%') OR ($wpdb->posts.post_content LIKE '%{$term}%')";
 
-        $posts = $wpdb->get_results( "SELECT ID, post_title, post_status, post_date FROM $wpdb->posts WHERE post_type = '$what' AND post_status IN ('draft', 'publish') AND ($search) ORDER BY post_date_gmt DESC LIMIT 50" );
+        $posts = $wpdb->get_results( "SELECT ID, post_title, post_status, post_date FROM $wpdb->posts WHERE $what AND post_status IN ('draft', 'publish') AND ($search) ORDER BY post_date_gmt DESC LIMIT 50" );
 
         if ( ! $posts ) {
                 $posttype = get_post_type_object($what);
@@ -1498 +1500 @@
 
         $x = new WP_Ajax_Response();
         $x->add( array(
-                'what' => $what,
+                'what' => $_POST['post_type'],
                 'data' => $html
         ));
         $x->send();

wp-admin/includes/template.php

@@ -1313 +1313 @@
                                 <input type="text" id="find-posts-input" name="ps" value="" />
                                 <input type="button" id="find-posts-search" value="<?php esc_attr_e( 'Search' ); ?>" class="button" /><br />
 
+                                <input type="radio" name="find-posts-what" id="find-posts-any" value="any" />
+                                <label for="find-posts-any"><?php _e( 'Any' ); ?></label>
                                 <?php
                                 $post_types = get_post_types( array('public' => true), 'objects' );
                                 foreach ( $post_types as $post ) {