Changeset 12375 for trunk/wp-admin/includes/template.php

Timestamp:

12/11/2009 11:14:43 PM (16 years ago)

Author:

ryan

Message:

Don't fallback to the options database when retrieving *_per_page user options. Props nacin. fixes #11385

File:

• trunk/wp-admin/includes/template.php (modified) (2 diffs)

trunk/wp-admin/includes/template.php

@@ -3717 +3717 @@
     }
 
-    $option = str_replace('-', '_', "${screen}_per_page");
-    $per_page = get_user_option($option);
-    if ( empty($per_page) ) {
+    $option = str_replace( '-', '_', "${screen}_per_page" );
+    $per_page = (int) get_user_option( $option, 0, false );
+    if ( empty( $per_page ) || $per_page < 1 ) {
         if ( 'plugins' == $screen )
             $per_page = 999;
@@ -3725 +3725 @@
             $per_page = 20;
     }
+    if ( 'edit_comments_per_page' == $option )
+        $per_page = apply_filters( 'comments_per_page', $per_page, isset($_REQUEST['comment_status']) ? $_REQUEST['comment_status'] : 'all' );
+    elseif ( 'categories' == $option )
+        $per_page = apply_filters( 'edit_categories_per_page', $per_page );
+    else
+        $per_page = apply_filters( $option, $per_page );
 
     $return = '<h5>' . __('Options') . "</h5>\n";