Make WordPress Core

Changeset 12375


Ignore:
Timestamp:
12/11/2009 11:14:43 PM (15 years ago)
Author:
ryan
Message:

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

Location:
trunk/wp-admin
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/categories.php

    r12317 r12375  
    167167    $pagenum = 1;
    168168
    169 $cats_per_page = get_user_option('categories_per_page');
    170 if ( empty($cats_per_page) )
     169$cats_per_page = (int) get_user_option( 'categories_per_page', 0, false );
     170if ( empty( $cats_per_page ) || $cats_per_page < 1 )
    171171    $cats_per_page = 20;
    172 $cats_per_page = apply_filters('edit_categories_per_page', $cats_per_page);
     172$cats_per_page = apply_filters( 'edit_categories_per_page', $cats_per_page );
    173173
    174174if ( !empty($_GET['s']) )
  • trunk/wp-admin/edit-comments.php

    r12308 r12375  
    237237
    238238<?php
    239 $comments_per_page = get_user_option('edit_comments_per_page');
    240 if ( empty($comments_per_page) )
     239$comments_per_page = (int) get_user_option( 'edit_comments_per_page', 0, false );
     240if ( empty( $comments_per_page ) || $comments_per_page < 1 )
    241241    $comments_per_page = 20;
    242 $comments_per_page = apply_filters('comments_per_page', $comments_per_page, $comment_status);
     242$comments_per_page = apply_filters( 'comments_per_page', $comments_per_page, $comment_status );
    243243
    244244if ( isset( $_GET['apage'] ) )
  • trunk/wp-admin/edit-pages.php

    r12308 r12375  
    229229if ( empty($pagenum) )
    230230    $pagenum = 1;
    231 $per_page = get_user_option('edit_pages_per_page');
    232 if ( empty( $per_page ) || $per_page < 0 )
     231$per_page = (int) get_user_option( 'edit_pages_per_page', 0, false );
     232if ( empty( $per_page ) || $per_page < 1 )
    233233    $per_page = 20;
     234$per_page = apply_filters( 'edit_pages_per_page', $per_page );
    234235
    235236$num_pages = ceil($wp_query->post_count / $per_page);
  • trunk/wp-admin/edit-tags.php

    r12317 r12375  
    185185    $pagenum = 1;
    186186
    187 $tags_per_page = get_user_option('edit_tags_per_page');
    188 if ( empty($tags_per_page) )
     187$tags_per_page = (int) get_user_option( 'edit_tags_per_page', 0, false );
     188if ( empty($tags_per_page) || $tags_per_page < 1 )
    189189    $tags_per_page = 20;
    190 $tags_per_page = apply_filters('edit_tags_per_page', $tags_per_page);
    191 $tags_per_page = apply_filters('tagsperpage', $tags_per_page); // Old filter
     190$tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
     191$tags_per_page = apply_filters( 'tagsperpage', $tags_per_page ); // Old filter
    192192
    193193$page_links = paginate_links( array(
  • trunk/wp-admin/includes/post.php

    r12373 r12375  
    846846    }
    847847
    848     $posts_per_page = get_user_option('edit_per_page');
    849     if ( empty($posts_per_page) )
     848    $posts_per_page = (int) get_user_option( 'edit_per_page', 0, false );
     849    if ( empty( $posts_per_page ) || $posts_per_page < 1 )
    850850        $posts_per_page = 15;
    851     $posts_per_page = apply_filters('edit_posts_per_page', $posts_per_page);
     851    $posts_per_page = apply_filters( 'edit_posts_per_page', $posts_per_page );
    852852
    853853    wp("post_type=post&$post_status_q&posts_per_page=$posts_per_page&order=$order&orderby=$orderby");
     
    904904    $q['post_type'] = 'attachment';
    905905    $q['post_status'] = isset( $q['status'] ) && 'trash' == $q['status'] ? 'trash' : 'inherit';
    906     $media_per_page = get_user_option('upload_per_page');
    907     if ( empty($media_per_page) )
     906    $media_per_page = (int) get_user_option( 'upload_per_page', 0, false );
     907    if ( empty( $media_per_page ) || $media_per_page < 1 )
    908908        $media_per_page = 20;
    909     $q['posts_per_page'] = $media_per_page;
     909    $q['posts_per_page'] = apply_filters( 'upload_per_page', $media_per_page );
    910910
    911911    $post_mime_types = get_post_mime_types();
  • trunk/wp-admin/includes/template.php

    r12318 r12375  
    37173717    }
    37183718
    3719     $option = str_replace('-', '_', "${screen}_per_page");
    3720     $per_page = get_user_option($option);
    3721     if ( empty($per_page) ) {
     3719    $option = str_replace( '-', '_', "${screen}_per_page" );
     3720    $per_page = (int) get_user_option( $option, 0, false );
     3721    if ( empty( $per_page ) || $per_page < 1 ) {
    37223722        if ( 'plugins' == $screen )
    37233723            $per_page = 999;
     
    37253725            $per_page = 20;
    37263726    }
     3727    if ( 'edit_comments_per_page' == $option )
     3728        $per_page = apply_filters( 'comments_per_page', $per_page, isset($_REQUEST['comment_status']) ? $_REQUEST['comment_status'] : 'all' );
     3729    elseif ( 'categories' == $option )
     3730        $per_page = apply_filters( 'edit_categories_per_page', $per_page );
     3731    else
     3732        $per_page = apply_filters( $option, $per_page );
    37273733
    37283734    $return = '<h5>' . __('Options') . "</h5>\n";
  • trunk/wp-admin/plugins.php

    r12317 r12375  
    351351$total_this_page = "total_{$status}_plugins";
    352352$total_this_page = $$total_this_page;
    353 $plugins_per_page = get_user_option('plugins_per_page');
    354 if ( empty($plugins_per_page) )
     353$plugins_per_page = (int) get_user_option( 'plugins_per_page', 0, false );
     354if ( empty( $plugins_per_page ) || $plugins_per_page < 1 )
    355355    $plugins_per_page = 999;
    356 $plugins_per_page = apply_filters('plugins_per_page', $plugins_per_page);
     356$plugins_per_page = apply_filters( 'plugins_per_page', $plugins_per_page );
    357357
    358358$start = ($page - 1) * $plugins_per_page;
  • trunk/wp-admin/upload.php

    r12308 r12375  
    135135if ( isset($_GET['detached']) ) {
    136136
    137     $media_per_page = (int) get_user_option('upload_per_page');
    138     if ( empty($media_per_page) )
     137    $media_per_page = (int) get_user_option( 'upload_per_page', 0, false );
     138    if ( empty($media_per_page) || $media_per_page < 1 )
    139139        $media_per_page = 20;
     140    $media_per_page = apply_filters( 'upload_per_page', $media_per_page );
    140141
    141142    if ( !empty($lost) ) {
Note: See TracChangeset for help on using the changeset viewer.