vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-12 04:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Deprecate argument. Never fallback to options table for user option requests. Props nacin. fixes #11615

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@12616 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2010-01-07 00:01:52 +00:00
parent e7003d6c95
commit dfe2e39c2c
10 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-admin/categories.php
+1 -1
View File
@@ -166,7 +166,7 @@ $pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
if ( empty($pagenum) )
$pagenum = 1;
$cats_per_page = (int) get_user_option( 'categories_per_page', 0, false );
$cats_per_page = (int) get_user_option( 'categories_per_page' );
if ( empty( $cats_per_page ) || $cats_per_page < 1 )
$cats_per_page = 20;
$cats_per_page = apply_filters( 'edit_categories_per_page', $cats_per_page );
wp-admin/edit-comments.php
+1 -1
View File
@@ -226,7 +226,7 @@ unset($status_links);
</p>
<?php
$comments_per_page = (int) get_user_option( 'edit_comments_per_page', 0, false );
$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 = apply_filters( 'comments_per_page', $comments_per_page, $comment_status );
wp-admin/edit-pages.php
+1 -1
View File
@@ -228,7 +228,7 @@ endif;
$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
if ( empty($pagenum) )
$pagenum = 1;
$per_page = (int) get_user_option( 'edit_pages_per_page', 0, false );
$per_page = (int) get_user_option( 'edit_pages_per_page' );
if ( empty( $per_page ) || $per_page < 1 )
$per_page = 20;
$per_page = apply_filters( 'edit_pages_per_page', $per_page );
wp-admin/edit-tags.php
+1 -1
View File
@@ -194,7 +194,7 @@ $pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
if ( empty($pagenum) )
$pagenum = 1;
$tags_per_page = (int) get_user_option( 'edit_tags_per_page', 0, false );
$tags_per_page = (int) get_user_option( 'edit_tags_per_page' );
if ( empty($tags_per_page) || $tags_per_page < 1 )
$tags_per_page = 20;
$tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
wp-admin/includes/post.php
+3 -3
View File
@@ -851,7 +851,7 @@ function wp_edit_posts_query( $q = false ) {
$post_type_q = 'post_type=' . $q['post_type'];
$posts_per_page = (int) get_user_option( 'edit_per_page', 0, false );
$posts_per_page = (int) get_user_option( 'edit_per_page' );
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 );
@@ -909,7 +909,7 @@ function wp_edit_attachments_query( $q = false ) {
$q['cat'] = isset( $q['cat'] ) ? (int) $q['cat'] : 0;
$q['post_type'] = 'attachment';
$q['post_status'] = isset( $q['status'] ) && 'trash' == $q['status'] ? 'trash' : 'inherit';
$media_per_page = (int) get_user_option( 'upload_per_page', 0, false );
$media_per_page = (int) get_user_option( 'upload_per_page' );
if ( empty( $media_per_page ) || $media_per_page < 1 )
$media_per_page = 20;
$q['posts_per_page'] = apply_filters( 'upload_per_page', $media_per_page );
@@ -939,7 +939,7 @@ function postbox_classes( $id, $page ) {
if ( isset( $_GET['edit'] ) && $_GET['edit'] == $id )
return '';
$current_user = wp_get_current_user();
if ( $closed = get_user_option('closedpostboxes_'.$page, 0, false ) ) {
if ( $closed = get_user_option('closedpostboxes_'.$page ) ) {
if ( !is_array( $closed ) ) {
return '';
}
wp-admin/includes/template.php
+4 -4
View File
@@ -983,7 +983,7 @@ function register_column_headers($screen, $columns) {
*/
function get_hidden_columns($page) {
$page = str_replace('.php', '', $page);
return (array) get_user_option( 'manage-' . $page . '-columns-hidden', 0, false );
return (array) get_user_option( 'manage-' . $page . '-columns-hidden' );
}
/**
@@ -2987,7 +2987,7 @@ function do_meta_boxes($page, $context, $object) {
$i = 0;
do {
// Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose
if ( !$already_sorted && $sorted = get_user_option( "meta-box-order_$page", 0, false ) ) {
if ( !$already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) ) {
foreach ( $sorted as $box_context => $ids )
foreach ( explode(',', $ids) as $id )
if ( $id )
@@ -3081,7 +3081,7 @@ function meta_box_prefs($page) {
}
function get_hidden_meta_boxes($page) {
$hidden = (array) get_user_option( "meta-box-hidden_$page", 0, false );
$hidden = (array) get_user_option( "meta-box-hidden_$page" );
// Hide slug boxes by default
if ( empty($hidden[0]) ) {
@@ -3737,7 +3737,7 @@ function screen_options($screen) {
}
$option = str_replace( '-', '_', "${screen}_per_page" );
$per_page = (int) get_user_option( $option, 0, false );
$per_page = (int) get_user_option( $option );
if ( empty( $per_page ) || $per_page < 1 ) {
if ( 'plugins' == $screen )
$per_page = 999;
wp-admin/plugins.php
+1 -1
View File
@@ -354,7 +354,7 @@ $plugins = &$$plugin_array_name;
//Paging.
$total_this_page = "total_{$status}_plugins";
$total_this_page = $$total_this_page;
$plugins_per_page = (int) get_user_option( 'plugins_per_page', 0, false );
$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 );
wp-admin/upload.php
+1 -1
View File
@@ -134,7 +134,7 @@ if ( ! isset( $_GET['paged'] ) || $_GET['paged'] < 1 )
if ( isset($_GET['detached']) ) {
$media_per_page = (int) get_user_option( 'upload_per_page', 0, false );
$media_per_page = (int) get_user_option( 'upload_per_page' );
if ( empty($media_per_page) || $media_per_page < 1 )
$media_per_page = 20;
$media_per_page = apply_filters( 'upload_per_page', $media_per_page );