vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 22:30:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add option defaults. Add arg to get_user_option() to avoid querying options table if user option is missing. see #8229

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@9871 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2008-11-25 18:33:04 +00:00
parent 85128c9da6
commit c1543ec4e6
8 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wp-includes/user.php
View File

@@ -168,9 +168,10 @@ function user_pass_ok($user_login, $user_pass) {
*
* @param string $option User option name.
* @param int $user Optional. User ID.
* @param bool $check_global Whether to check for a global option if a per-user option does not exist. Default is true.
* @return mixed
*/
function get_user_option( $option, $user = 0 ) {
function get_user_option( $option, $user = 0, $check_global = true ) {
global $wpdb;
$option = preg_replace('|[^a-z0-9_]|i', '', $option);
@@ -183,8 +184,10 @@ function get_user_option( $option, $user = 0 ) {
$result = $user->{$wpdb->prefix . $option};
elseif ( isset( $user->{$option} ) ) // User specific and cross-blog
$result = $user->{$option};
else // Blog global
elseif ( $check_global ) // Blog global
$result = get_option( $option );
else
$result = false;
return apply_filters("get_user_option_{$option}", $result, $option, $user);
}