diff --git a/wp-includes/user.php b/wp-includes/user.php index a4ff0bb340..ca4b3d03fd 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -691,7 +691,7 @@ function get_user_option( $option, $user = 0, $deprecated = '' ) { * Updates user option with global blog capability. * * User options are just like user metadata except that they have support for - * global blog options. If the 'global' parameter is false, which it is by default + * global blog options. If the 'is_global' parameter is false, which it is by default, * it will prepend the WordPress table prefix to the option name. * * Deletes the user option if $newvalue is empty. @@ -703,15 +703,15 @@ function get_user_option( $option, $user = 0, $deprecated = '' ) { * @param int $user_id User ID. * @param string $option_name User option name. * @param mixed $newvalue User option value. - * @param bool $global Optional. Whether option name is global or blog specific. + * @param bool $is_global Optional. Whether option name is global or blog specific. * Default false (blog specific). * @return int|bool User meta ID if the option didn't exist, true on successful update, * false on failure. */ -function update_user_option( $user_id, $option_name, $newvalue, $global = false ) { +function update_user_option( $user_id, $option_name, $newvalue, $is_global = false ) { global $wpdb; - if ( ! $global ) { + if ( ! $is_global ) { $option_name = $wpdb->get_blog_prefix() . $option_name; } @@ -722,7 +722,7 @@ function update_user_option( $user_id, $option_name, $newvalue, $global = false * Deletes user option with global blog capability. * * User options are just like user metadata except that they have support for - * global blog options. If the 'global' parameter is false, which it is by default + * global blog options. If the 'is_global' parameter is false, which it is by default, * it will prepend the WordPress table prefix to the option name. * * @since 3.0.0 @@ -731,16 +731,17 @@ function update_user_option( $user_id, $option_name, $newvalue, $global = false * * @param int $user_id User ID * @param string $option_name User option name. - * @param bool $global Optional. Whether option name is global or blog specific. + * @param bool $is_global Optional. Whether option name is global or blog specific. * Default false (blog specific). * @return bool True on success, false on failure. */ -function delete_user_option( $user_id, $option_name, $global = false ) { +function delete_user_option( $user_id, $option_name, $is_global = false ) { global $wpdb; - if ( ! $global ) { + if ( ! $is_global ) { $option_name = $wpdb->get_blog_prefix() . $option_name; } + return delete_user_meta( $user_id, $option_name ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index e49c632c31..c68d2891f0 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.2-alpha-55014'; +$wp_version = '6.2-alpha-55015'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.