Ticket #13229: 13229-3.diff

wp-includes/ms-functions.php

@@ -839 +839 @@
                 update_user_meta( $user_id, 'primary_blog', $blog_id );
 
         restore_current_blog();
-        do_action( 'wpmu_new_blog', $blog_id, $user_id, $domain, $path, $site_id );
+        do_action( 'wpmu_new_blog', $blog_id, $user_id, $domain, $path, $site_id, $meta );
 
         return $blog_id;
 }

wp-admin/admin-ajax.php

@@ -1265 +1265 @@
         if ( empty($_POST['ps']) )
                 exit;
 
-        $what = isset($_POST['pages']) ? 'page' : 'post';
+        if(!empty($_POST['post_type']) && in_array($_POST['post_type'], get_post_types(array() ))) {
+                $what = $_POST['post_type'];
+        } else {
+                $what = 'post';
+        }
+
         $s = stripslashes($_POST['ps']);
         preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches);
         $search_terms = array_map('_search_terms_tidy', $matches[0]);
@@ -1282 +1287 @@
 
         $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" );
 
-        if ( ! $posts )
-                exit( __('No posts found.') );
+        if ( ! $posts ) {
+                $posttype = get_post_type_object($what);
+                exit($posttype->labels->not_found);
+        }
 
         $html = '<table class="widefat" cellspacing="0"><thead><tr><th class="found-radio"><br /></th><th>'.__('Title').'</th><th>'.__('Date').'</th><th>'.__('Status').'</th></tr></thead><tbody>';
         foreach ( $posts as $post ) {

wp-admin/includes/template.php

@@ -3278 +3278 @@
                                 <input type="text" id="find-posts-input" name="ps" value="" />
                                 <input type="button" onclick="findPosts.send();" value="<?php esc_attr_e( 'Search' ); ?>" class="button" /><br />
 
-                                <input type="radio" name="find-posts-what" id="find-posts-posts" checked="checked" value="posts" />
+                                <input type="radio" name="find-posts-what" id="find-posts-posts" checked="checked" value="post" />
                                 <label for="find-posts-posts"><?php _e( 'Posts' ); ?></label>
-                                <input type="radio" name="find-posts-what" id="find-posts-pages" value="pages" />
+                                <input type="radio" name="find-posts-what" id="find-posts-pages" value="page" />
                                 <label for="find-posts-pages"><?php _e( 'Pages' ); ?></label>
+
+                                <?php
+                                $post_types = get_post_types(array('public' => true, '_builtin' => false), 'objects');
+                                foreach ($post_types AS $post) {
+                                ?>
+                                <input type="radio" name="find-posts-what" id="find-posts-<?php echo esc_attr($post->name); ?>" value="<?php echo $post->name; ?>" />
+                                <label for="find-posts-<?php echo esc_attr($post->name); ?>"><?php echo $post->label; ?></label>
+                                <?php
+                                } ?>
                         </div>
                         <div id="find-posts-response"></div>
                 </div>

wp-admin/js/media.dev.js

@@ -31 +31 @@
                                 _ajax_nonce: $('#_ajax_nonce').val()
                         };
 
-                        if ( $('#find-posts-pages').is(':checked') ) {
-                                post['pages'] = 1;
-                        } else {
-                                post['posts'] = 1;
-                        }
+                        var selectedItem;
+                        $("input[@name='itemSelect[]']:checked").each(function() { selectedItem = $(this).val() });
+                        post['post_type'] = selectedItem;
+
                         $.ajax({
                                 type : 'POST',
                                 url : ajaxurl,