Make posts per page filters consistent and back compat. Props wpmuguru. fixes #14135 for 3.1
git-svn-id: https://develop.svn.wordpress.org/trunk@15450 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
c9d4749ed7
commit
432adc1c33
|
@ -43,12 +43,13 @@ if ( 'post' != $post_type ) {
|
||||||
$pagenum = isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 0;
|
$pagenum = isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 0;
|
||||||
if ( empty($pagenum) )
|
if ( empty($pagenum) )
|
||||||
$pagenum = 1;
|
$pagenum = 1;
|
||||||
$per_page = 'edit_' . $post_type . '_per_page';
|
$edit_per_page = 'edit_' . $post_type . '_per_page';
|
||||||
$per_page = (int) get_user_option( $per_page );
|
$per_page = (int) get_user_option( $edit_per_page );
|
||||||
if ( empty( $per_page ) || $per_page < 1 )
|
if ( empty( $per_page ) || $per_page < 1 )
|
||||||
$per_page = 20;
|
$per_page = 20;
|
||||||
// @todo filter based on type
|
|
||||||
$per_page = apply_filters( 'edit_posts_per_page', $per_page );
|
$per_page = apply_filters( $edit_per_page, $per_page );
|
||||||
|
$per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
|
||||||
|
|
||||||
// Handle bulk actions
|
// Handle bulk actions
|
||||||
if ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delete_all']) || isset($_GET['delete_all2']) || isset($_GET['bulk_edit']) ) {
|
if ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delete_all']) || isset($_GET['delete_all2']) || isset($_GET['bulk_edit']) ) {
|
||||||
|
|
|
@ -895,8 +895,9 @@ function wp_edit_posts_query( $q = false ) {
|
||||||
$posts_per_page = (int) get_user_option( $per_page );
|
$posts_per_page = (int) get_user_option( $per_page );
|
||||||
if ( empty( $posts_per_page ) || $posts_per_page < 1 )
|
if ( empty( $posts_per_page ) || $posts_per_page < 1 )
|
||||||
$posts_per_page = 20;
|
$posts_per_page = 20;
|
||||||
$posts_per_page = apply_filters( $per_page, $posts_per_page );
|
|
||||||
|
|
||||||
|
$posts_per_page = apply_filters( $per_page, $posts_per_page );
|
||||||
|
$posts_per_page = apply_filters( 'edit_posts_per_page', $posts_per_page, $post_type );
|
||||||
|
|
||||||
$query = compact('post_type', 'post_status', 'perm', 'order', 'orderby', 'posts_per_page');
|
$query = compact('post_type', 'post_status', 'perm', 'order', 'orderby', 'posts_per_page');
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue