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

Make wp_user_settings() options global again. Clarify flag on get_user_option().

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@10095 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2008-12-07 03:53:28 +00:00
parent cc1e3f416b
commit 6c98f491fa
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-includes/user.php
+3 -3
View File
@@ -168,10 +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.
* @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.
* @return mixed
*/
function get_user_option( $option, $user = 0, $check_global = true ) {
function get_user_option( $option, $user = 0, $check_blog_options = true ) {
global $wpdb;
$option = preg_replace('|[^a-z0-9_]|i', '', $option);
@@ -184,7 +184,7 @@ function get_user_option( $option, $user = 0, $check_global = true ) {
$result = $user->{$wpdb->prefix . $option};
elseif ( isset( $user->{$option} ) ) // User specific and cross-blog
$result = $user->{$option};
elseif ( $check_global ) // Blog global
elseif ( $check_blog_options ) // Blog global
$result = get_option( $option );
else
$result = false;