← All changes | includes/user.php +5 -13 2.5 → 2.4 View file →

		@@ -58,27 +58,19 @@
58	58	}
59	59	}
60	60
61	61	function bogo_get_user_locale( $user_id = 0 ) {
62		- global $current_user;
63		-
64		- $default_locale = bogo_get_default_locale();
65		- $user_id = absint( $user_id );
66		-
67		- if ( ! $user_id ) {
68		- if ( function_exists( 'wp_get_current_user' ) && ! empty( $current_user ) ) {
69		- $user_id = get_current_user_id();
70		- } elseif ( ! $user_id = apply_filters( 'determine_current_user', false ) ) {
71		- return $default_locale;
72		- }
	62	+ if ( ! $user_id = absint( $user_id ) ) {
	63	+ $user_id = get_current_user_id();
73	64	}
74	65
75	66	$locale = get_user_option( 'locale', $user_id );
76	67
77		- if ( bogo_is_available_locale( $locale )
78		- && user_can( $user_id, 'bogo_access_locale', $locale ) ) {
	68	+ if ( user_can( $user_id, 'bogo_access_locale', $locale ) ) {
79	69	return $locale;
80	70	}
	71	+
	72	+ $default_locale = bogo_get_default_locale();
81	73
82	74	if ( user_can( $user_id, 'bogo_access_locale', $default_locale ) ) {
83	75	return $default_locale;
84	76	}