Changeset 12375
- Timestamp:
- 12/11/2009 11:14:43 PM (15 years ago)
- Location:
- trunk/wp-admin
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/categories.php
r12317 r12375 167 167 $pagenum = 1; 168 168 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 ); 170 if ( empty( $cats_per_page ) || $cats_per_page < 1 ) 171 171 $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 ); 173 173 174 174 if ( !empty($_GET['s']) ) -
trunk/wp-admin/edit-comments.php
r12308 r12375 237 237 238 238 <?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 ); 240 if ( empty( $comments_per_page ) || $comments_per_page < 1 ) 241 241 $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 ); 243 243 244 244 if ( isset( $_GET['apage'] ) ) -
trunk/wp-admin/edit-pages.php
r12308 r12375 229 229 if ( empty($pagenum) ) 230 230 $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 ); 232 if ( empty( $per_page ) || $per_page < 1 ) 233 233 $per_page = 20; 234 $per_page = apply_filters( 'edit_pages_per_page', $per_page ); 234 235 235 236 $num_pages = ceil($wp_query->post_count / $per_page); -
trunk/wp-admin/edit-tags.php
r12317 r12375 185 185 $pagenum = 1; 186 186 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 ); 188 if ( empty($tags_per_page) || $tags_per_page < 1 ) 189 189 $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 filter190 $tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page ); 191 $tags_per_page = apply_filters( 'tagsperpage', $tags_per_page ); // Old filter 192 192 193 193 $page_links = paginate_links( array( -
trunk/wp-admin/includes/post.php
r12373 r12375 846 846 } 847 847 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 ) 850 850 $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 ); 852 852 853 853 wp("post_type=post&$post_status_q&posts_per_page=$posts_per_page&order=$order&orderby=$orderby"); … … 904 904 $q['post_type'] = 'attachment'; 905 905 $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 ) 908 908 $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 ); 910 910 911 911 $post_mime_types = get_post_mime_types(); -
trunk/wp-admin/includes/template.php
r12318 r12375 3717 3717 } 3718 3718 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 ) { 3722 3722 if ( 'plugins' == $screen ) 3723 3723 $per_page = 999; … … 3725 3725 $per_page = 20; 3726 3726 } 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 ); 3727 3733 3728 3734 $return = '<h5>' . __('Options') . "</h5>\n"; -
trunk/wp-admin/plugins.php
r12317 r12375 351 351 $total_this_page = "total_{$status}_plugins"; 352 352 $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 ); 354 if ( empty( $plugins_per_page ) || $plugins_per_page < 1 ) 355 355 $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 ); 357 357 358 358 $start = ($page - 1) * $plugins_per_page; -
trunk/wp-admin/upload.php
r12308 r12375 135 135 if ( isset($_GET['detached']) ) { 136 136 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 ) 139 139 $media_per_page = 20; 140 $media_per_page = apply_filters( 'upload_per_page', $media_per_page ); 140 141 141 142 if ( !empty($lost) ) {
Note: See TracChangeset
for help on using the changeset viewer.