From 0e4bc929a11fa9f6c019bcf58347bb1bbd03adf8 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Tue, 12 Jan 2010 15:23:10 +0000 Subject: [PATCH] Make wp_edit_posts_query() more post_type aware. Use array calling style. see #9674 git-svn-id: https://develop.svn.wordpress.org/trunk@12706 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/edit.php | 1 + wp-admin/includes/post.php | 19 +++++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 87b7893264..52016fcd14 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -24,6 +24,7 @@ if ( isset($_GET['post_type']) && in_array( $_GET['post_type'], get_post_types( $post_type = $_GET['post_type']; else $post_type = 'post'; +$_GET['post_type'] = $post_type; $post_type_object = get_post_type_object($post_type); diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index 3f9f76de4b..d6c6819ce4 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -828,12 +828,16 @@ function wp_edit_posts_query( $q = false ) { $post_stati = apply_filters('post_stati', $post_stati); - $avail_post_stati = get_available_post_statuses('post'); + if ( isset($q['post_type']) && in_array( $q['post_type'], get_post_types( array('_show' => true) ) ) ) + $post_type = $q['post_type']; + else + $post_type = 'post'; + + $avail_post_stati = get_available_post_statuses($post_type); - $post_status_q = ''; if ( isset($q['post_status']) && in_array( $q['post_status'], array_keys($post_stati) ) ) { - $post_status_q = '&post_status=' . $q['post_status']; - $post_status_q .= '&perm=readable'; + $post_status = $q['post_status']; + $perm = 'readable'; } if ( isset($q['post_status']) && 'pending' === $q['post_status'] ) { @@ -847,17 +851,12 @@ function wp_edit_posts_query( $q = false ) { $orderby = 'date'; } - $post_type_q = 'post_type=post'; - if ( isset($q['post_type']) && in_array( $q['post_type'], get_post_types( array('_show' => true) ) ) ) - $post_type_q = 'post_type=' . $q['post_type']; - - $posts_per_page = (int) get_user_option( 'edit_per_page' ); if ( empty( $posts_per_page ) || $posts_per_page < 1 ) $posts_per_page = 15; $posts_per_page = apply_filters( 'edit_posts_per_page', $posts_per_page ); - wp("$post_type_q&$post_status_q&posts_per_page=$posts_per_page&order=$order&orderby=$orderby"); + wp( compact('post_type', 'post_status', 'perm', 'order', 'orderby', 'posts_per_page') ); return array($post_stati, $avail_post_stati); }