From 45ec04e3e9fd86f0e0b4f0e60a79f047aad24de2 Mon Sep 17 00:00:00 2001 From: ryan Date: Thu, 7 Jan 2010 00:01:52 +0000 Subject: [PATCH] Deprecate argument. Never fallback to options table for user option requests. Props nacin. fixes #11615 git-svn-id: http://svn.automattic.com/wordpress/trunk@12616 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/categories.php | 2 +- wp-admin/edit-comments.php | 2 +- wp-admin/edit-pages.php | 2 +- wp-admin/edit-tags.php | 2 +- wp-admin/includes/post.php | 6 +++--- wp-admin/includes/template.php | 8 ++++---- wp-admin/plugins.php | 2 +- wp-admin/upload.php | 2 +- wp-includes/functions.php | 4 ++-- wp-includes/user.php | 9 +++++---- 10 files changed, 20 insertions(+), 19 deletions(-) diff --git a/wp-admin/categories.php b/wp-admin/categories.php index 3fa4b605f..5fe9ef6ff 100644 --- a/wp-admin/categories.php +++ b/wp-admin/categories.php @@ -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 ); diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index 7fe6880a2..24982a9cb 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -226,7 +226,7 @@ unset($status_links);

$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; diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 22ce380b3..185f68f21 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -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 ); diff --git a/wp-admin/upload.php b/wp-admin/upload.php index 58c3a72a9..6c373134d 100644 --- a/wp-admin/upload.php +++ b/wp-admin/upload.php @@ -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 ); diff --git a/wp-includes/functions.php b/wp-includes/functions.php index cfd7cc06a..01235988e 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -770,7 +770,7 @@ function wp_user_settings() { if ( ! $user = wp_get_current_user() ) return; - $settings = get_user_option( 'user-settings', $user->ID, false ); + $settings = get_user_option( 'user-settings', $user->ID ); if ( isset( $_COOKIE['wp-settings-' . $user->ID] ) ) { $cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $user->ID] ); @@ -779,7 +779,7 @@ function wp_user_settings() { if ( $cookie == $settings ) return; - $last_time = (int) get_user_option( 'user-settings-time', $user->ID, false ); + $last_time = (int) get_user_option( 'user-settings-time', $user->ID ); $saved = isset( $_COOKIE['wp-settings-time-' . $user->ID]) ? preg_replace( '/[^0-9]/', '', $_COOKIE['wp-settings-time-' . $user->ID] ) : 0; if ( $saved > $last_time ) { diff --git a/wp-includes/user.php b/wp-includes/user.php index 71fd7a322..06d7159e2 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -214,12 +214,15 @@ function user_pass_ok($user_login, $user_pass) { * * @param string $option User option name. * @param int $user Optional. User ID. - * @param bool $check_blog_options Whether to check for an option in the options table if a per-user option does not exist. Default is true. + * @param bool $deprecated Use get_option() to check for an option in the options table. * @return mixed */ -function get_user_option( $option, $user = 0, $check_blog_options = true ) { +function get_user_option( $option, $user = 0, $deprecated = '' ) { global $wpdb; + if ( !empty( $deprecated ) ) + _deprecated_argument( __FUNCTION__, '3.0' ); + $option = preg_replace('|[^a-z0-9_]|i', '', $option); if ( empty($user) ) $user = wp_get_current_user(); @@ -230,8 +233,6 @@ function get_user_option( $option, $user = 0, $check_blog_options = true ) { $result = $user->{$wpdb->prefix . $option}; elseif ( isset( $user->{$option} ) ) // User specific and cross-blog $result = $user->{$option}; - elseif ( $check_blog_options ) // Blog global - $result = get_option( $option ); else $result = false;