Changeset 15569

Timestamp:

09/05/2010 03:15:46 PM (14 years ago)

Author:

scribu

Message:

Introduce WP_List_Table::get_items_per_page(). See #14579

Location:

trunk/wp-admin/includes

Files:

• default-list-tables.php (modified) (9 diffs)
• list-table.php (modified) (1 diff)

trunk/wp-admin/includes/default-list-tables.php

@@ -65 +65 @@
         $total_items = $this->hierarchical_display ? $wp_query->post_count : $wp_query->found_posts;
 
-        $edit_per_page = 'edit_' . $post_type . '_per_page'; 
-        $per_page = (int) get_user_option( $edit_per_page );
-        if ( empty( $per_page ) || $per_page < 1 )
-            $per_page = 20;
-        $per_page = apply_filters( $edit_per_page, $per_page ); 
+        $per_page = $this->get_items_per_page( 'edit_' . $post_type . '_per_page' );
         $per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type ); 
 
@@ -1368 +1364 @@
         global $taxonomy;
 
-        $tags_per_page = (int) get_user_option( 'edit_' .  $taxonomy . '_per_page' );
-
-        if ( empty( $tags_per_page ) || $tags_per_page < 1 )
-            $tags_per_page = 20;
+        $tags_per_page = $this->get_items_per_page( 'edit_' .  $taxonomy . '_per_page' );
 
         if ( 'post_tag' == $taxonomy ) {
@@ -1378 +1371 @@
         } elseif ( 'category' == $taxonomy ) {
             $tags_per_page = apply_filters( 'edit_categories_per_page', $tags_per_page ); // Old filter
-        } else {
-            $tags_per_page = apply_filters( 'edit_' . $taxonomy . '_per_page', $tags_per_page );
         }
 
@@ -1708 +1699 @@
         $role = isset( $_REQUEST['role'] ) ? $_REQUEST['role'] : '';
 
-        $users_per_page = (int) get_user_option( 'users_per_page' );
-        if ( empty( $users_per_page ) || $users_per_page < 1 )
-            $users_per_page = 20;
-        $users_per_page = apply_filters( 'users_per_page', $users_per_page );
+        $users_per_page = $this->get_items_per_page( 'users_per_page' );
 
         $paged = $this->get_pagenum();
@@ -1962 +1950 @@
         $search = ( isset( $_REQUEST['s'] ) ) ? $_REQUEST['s'] : '';
 
-        if ( isset( $_POST['per_page'] ) )
-            $comments_per_page = $_POST['per_page'];
-        else
-            $comments_per_page = (int) get_user_option( 'edit_comments_per_page' );
-
-        if ( empty( $comments_per_page ) || $comments_per_page < 1 )
-            $comments_per_page = 20;
+        $comments_per_page = $this->get_items_per_page( 'edit_comments_per_page' );
         $comments_per_page = apply_filters( 'comments_per_page', $comments_per_page, $comment_status );
 
@@ -2553 +2535 @@
         $mode = ( empty( $_REQUEST['mode'] ) ) ? 'list' : $_REQUEST['mode'];
 
+        $per_page = $this->get_items_per_page( 'ms_sites_per_page' );
+
         $pagenum = $this->get_pagenum();
-
-        $per_page = (int) get_user_option( 'ms_sites_per_page' );
-        if ( empty( $per_page ) || $per_page < 1 )
-            $per_page = 20;
-
-        $per_page = apply_filters( 'ms_sites_per_page', $per_page );
 
         $s = isset( $_REQUEST['s'] ) ? stripslashes( trim( $_REQUEST[ 's' ] ) ) : '';
@@ -2837 +2815 @@
     }
 
-    function check_permissions() {          
+    function check_permissions() {
         if ( !is_multisite() )
             wp_die( __( 'Multisite support is not enabled.' ) );
@@ -2850 +2828 @@
         $mode = ( empty( $_REQUEST['mode'] ) ) ? 'list' : $_REQUEST['mode'];
 
+        $per_page = $this->get_items_per_page( 'ms_users_per_page' );
+
         $pagenum = $this->get_pagenum();
-
-        $per_page = (int) get_user_option( 'ms_users_per_page' );
-        if ( empty( $per_page ) || $per_page < 1 )
-            $per_page = 20;
-
-        $per_page = apply_filters( 'ms_users_per_page', $per_page );
 
         $s = isset( $_REQUEST['s'] ) ? stripslashes( trim( $_REQUEST[ 's' ] ) ) : '';
@@ -3208 +3182 @@
             uasort( $this->items, '_order_plugins_callback' );
         }
-
-        $plugins_per_page = (int) get_user_option( 'plugins_per_page' );
-        if ( empty( $plugins_per_page ) || $plugins_per_page < 1 )
-            $plugins_per_page = 999;
-        $plugins_per_page = apply_filters( 'plugins_per_page', $plugins_per_page );
+        
+        $plugins_per_page = $this->get_items_per_page( 'plugins_per_page', 999 );
 
         $start = ( $page - 1 ) * $plugins_per_page;

trunk/wp-admin/includes/list-table.php

@@ -324 +324 @@
     
         return max( 1, $pagenum );
+    }
+
+    /**
+     * Get number of items to display on a single page
+     *
+     * @since 3.1.0
+     * @access protected
+     *
+     * @return int
+     */ 
+    function get_items_per_page( $option, $default = 20 ) {
+        $per_page = (int) get_user_option( $option );
+        if ( empty( $per_page ) || $per_page < 1 )
+            $per_page = $default;
+
+        return (int) apply_filters( $option, $per_page );
     }