IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests 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: http://svn.automattic.com/wordpress/trunk@12616 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
2010-01-07 00:01:52 +00:00
parent 1a8bb6d244
commit 45ec04e3e9
10 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/includes/post.php
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 '';
}

8
wp-admin/includes/template.php
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;