diff options
Diffstat (limited to 'wp-admin')
| -rw-r--r-- | wp-admin/admin-ajax.php | 4 | ||||
| -rw-r--r-- | wp-admin/edit.php | 6 | ||||
| -rw-r--r-- | wp-admin/includes/post.php | 18 | ||||
| -rw-r--r-- | wp-admin/js/edit-posts.js | 2 |
4 files changed, 18 insertions, 12 deletions
diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php index 8d15c9c..64c9b06 100644 --- a/wp-admin/admin-ajax.php +++ b/wp-admin/admin-ajax.php @@ -15,7 +15,9 @@ switch ( $action = $_POST['action'] ) : case 'add-post' : check_ajax_referer( 'add-post' ); add_filter( 'post_limits', $limit_filter = create_function( '$a', '$b = split(" ",$a); if ( !isset($b[2]) ) return $a; $start = intval(trim($b[1])) / 20 * 15; if ( !is_int($start) ) return $a; $start += intval(trim($b[2])) - 1; return "LIMIT $start, 1";' ) ); - wp_edit_posts_query( '_POST' ); + wp_edit_posts_query( $_POST ); + if ( !have_posts() ) + die('1'); $posts_columns = wp_manage_posts_columns(); ob_start(); include( 'edit-post-rows.php' ); diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 06ab9ca..6e8d978 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -108,8 +108,6 @@ if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { ? <?php wp_dropdown_categories('show_option_all='.__('All').'&hide_empty=1&hierarchical=1&show_count=1&selected='.$cat);?> </fieldset> <input type="submit" id="post-query-submit" value="<?php _e('Filter »'); ?>" class="button" /> - <?php wp_nonce_field( 'add-post', '_ajax_nonce', false ); ?> - <input type="button" id="get-extra-button" class="add:the-extra-list:searchform" style="display:none" /> </form> <?php do_action('restrict_manage_posts'); ?> @@ -118,6 +116,10 @@ if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { ? <?php include( 'edit-post-rows.php' ); ?> +<form action="" method="post" id="get-extra-posts" class="add:the-extra-list:" style="display:none"> + <?php wp_nonce_field( 'add-post', '_ajax_nonce', false ); ?> +</form> + <div id="ajax-response"></div> <div class="navigation"> diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index b88e3b0..3c9cc77 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -476,10 +476,12 @@ function _relocate_children( $old_ID, $new_ID ) { return $wpdb->query( "UPDATE $wpdb->posts SET post_parent = $new_ID WHERE post_parent = $old_ID" ); } -function wp_edit_posts_query( $q = '_GET' ) { +function wp_edit_posts_query( $q = false ) { global $wpdb; - $$q['m'] = (int) $$q['m']; - $$q['cat'] = (int) $$q['cat']; + if ( false === $q ) + $q = $_GET; + $q['m'] = (int) $q['m']; + $q['cat'] = (int) $q['cat']; $post_stati = array( // array( adj, noun ) 'draft' => array(__('Draft'), _c('Drafts|manage posts header')), 'future' => array(__('Scheduled'), __('Scheduled posts')), @@ -492,15 +494,15 @@ function wp_edit_posts_query( $q = '_GET' ) { $post_status_q = ''; $post_status_label = _c('Posts|manage posts header'); - if ( isset($$q['post_status']) && in_array( $$q['post_status'], array_keys($post_stati) ) ) { - $post_status_label = $post_stati[$$q['post_status']][1]; - $post_status_q = '&post_status=' . $$q['post_status']; + if ( isset($q['post_status']) && in_array( $q['post_status'], array_keys($post_stati) ) ) { + $post_status_label = $post_stati[$q['post_status']][1]; + $post_status_q = '&post_status=' . $q['post_status']; } - if ( 'pending' === $$q['post_status'] ) { + if ( 'pending' === $q['post_status'] ) { $order = 'ASC'; $orderby = 'modified'; - } elseif ( 'draft' === $$q['post_status'] ) { + } elseif ( 'draft' === $q['post_status'] ) { $order = 'DESC'; $orderby = 'modified'; } else { diff --git a/wp-admin/js/edit-posts.js b/wp-admin/js/edit-posts.js index c85fba9..5241c4c 100644 --- a/wp-admin/js/edit-posts.js +++ b/wp-admin/js/edit-posts.js @@ -6,7 +6,7 @@ if ( document.location.href.match(/(\?|&)c=/) ) else delAfter = function() { list[0].wpList.add( extra.children(':eq(0)').remove().clone() ); - $('#get-extra-button').click(); + $('#get-extra-posts').submit(); } var addBefore = function ( settings ) { |