From a5038e70bd7cfb96025fadeda2a3a7b3cbfc6554 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 15 Jul 2022 13:43:51 +0000 Subject: [PATCH] Coding Standards: Rename the `$user_id` parameter of `get_user_locale()` to `$user` for accuracy. Since the parameter accepts not only a user's ID, but also a `WP_User` object, `$user` is a more appropriate name, which better aligns with the `$post` parameter of functions that accept a post ID or a `WP_Post` object. The pre-existing internal `$user` variable which contained a `WP_User` object is renamed to `$user_object` for clarity. Follow-up to [38955]. Props aristath, poena, afercia, SergeyBiryukov. See #55647. git-svn-id: https://develop.svn.wordpress.org/trunk@53702 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/l10n.php | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/wp-includes/l10n.php b/src/wp-includes/l10n.php index 03db84d2af..292355105e 100644 --- a/src/wp-includes/l10n.php +++ b/src/wp-includes/l10n.php @@ -88,24 +88,26 @@ function get_locale() { * * @since 4.7.0 * - * @param int|WP_User $user_id User's ID or a WP_User object. Defaults to current user. + * @param int|WP_User $user User's ID or a WP_User object. Defaults to current user. * @return string The locale of the user. */ -function get_user_locale( $user_id = 0 ) { - $user = false; - if ( 0 === $user_id && function_exists( 'wp_get_current_user' ) ) { - $user = wp_get_current_user(); - } elseif ( $user_id instanceof WP_User ) { - $user = $user_id; - } elseif ( $user_id && is_numeric( $user_id ) ) { - $user = get_user_by( 'id', $user_id ); +function get_user_locale( $user = 0 ) { + $user_object = false; + + if ( 0 === $user && function_exists( 'wp_get_current_user' ) ) { + $user_object = wp_get_current_user(); + } elseif ( $user instanceof WP_User ) { + $user_object = $user; + } elseif ( $user && is_numeric( $user ) ) { + $user_object = get_user_by( 'id', $user ); } - if ( ! $user ) { + if ( ! $user_object ) { return get_locale(); } - $locale = $user->locale; + $locale = $user_object->locale; + return $locale ? $locale : get_locale(); }