Changeset 12375 for trunk/wp-admin/includes/post.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/post.php (modified) (2 diffs)

trunk/wp-admin/includes/post.php

@@ -846 +846 @@
     }
 
-    $posts_per_page = get_user_option('edit_per_page');
-    if ( empty($posts_per_page) )
+    $posts_per_page = (int) get_user_option( 'edit_per_page', 0, false );
+    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);
+    $posts_per_page = apply_filters( 'edit_posts_per_page', $posts_per_page );
 
     wp("post_type=post&$post_status_q&posts_per_page=$posts_per_page&order=$order&orderby=$orderby");
@@ -904 +904 @@
     $q['post_type'] = 'attachment';
     $q['post_status'] = isset( $q['status'] ) && 'trash' == $q['status'] ? 'trash' : 'inherit';
-    $media_per_page = get_user_option('upload_per_page');
-    if ( empty($media_per_page) )
+    $media_per_page = (int) get_user_option( 'upload_per_page', 0, false );
+    if ( empty( $media_per_page ) || $media_per_page < 1 )
         $media_per_page = 20;
-    $q['posts_per_page'] = $media_per_page;
+    $q['posts_per_page'] = apply_filters( 'upload_per_page', $media_per_page );
 
     $post_mime_types = get_post_mime_types();