← All changes | includes/user.php +12 -34 2.8 → 2.4 View file →

		@@ -7,11 +7,10 @@
7	7	function bogo_admin_bar_menu( $wp_admin_bar ) {
8	8	$current_locale = bogo_get_user_locale();
9	9	$current_language = bogo_get_language( $current_locale );
10	10
11		- if ( ! $current_language ) {
	11	+ if ( ! $current_language )
12	12	$current_language = $current_locale;
13		- }
14	13
15	14	$wp_admin_bar->add_menu( array(
16	15	'parent' => 'top-secondary',
17	16	'id' => 'bogo-user-locale',
		@@ -18,9 +17,8 @@
18	17	'title' => '✔ ' . $current_language ) );
19	18
20	19	$available_languages = bogo_available_languages( array(
21	20	'exclude' => array( $current_locale ),
22		- 'exclude_enus_if_inactive' => true,
23	21	'current_user_can_access' => true ) );
24	22
25	23	foreach ( $available_languages as $locale => $lang ) {
26	24	$url = admin_url( 'profile.php?action=bogo-switch-locale&locale=' . $locale );
		@@ -41,21 +39,17 @@
41	39
42	40	add_action( 'admin_init', 'bogo_switch_user_locale' );
43	41
44	42	function bogo_switch_user_locale() {
45		- if ( empty( $_REQUEST['action'] )
46		- || 'bogo-switch-locale' != $_REQUEST['action'] ) {
	43	+ if ( empty( $_REQUEST['action'] ) || 'bogo-switch-locale' != $_REQUEST['action'] )
47	44	return;
48		- }
49	45
50	46	check_admin_referer( 'bogo-switch-locale' );
51	47
52	48	$locale = isset( $_REQUEST['locale'] ) ? $_REQUEST['locale'] : '';
53	49
54		- if ( ! bogo_is_available_locale( $locale )
55		- || $locale == bogo_get_user_locale() ) {
	50	+ if ( ! bogo_is_available_locale( $locale ) || $locale == bogo_get_user_locale() )
56	51	return;
57		- }
58	52
59	53	update_user_option( get_current_user_id(), 'locale', $locale, true );
60	54
61	55	if ( ! empty( $_REQUEST['redirect_to'] ) ) {
		@@ -64,37 +58,25 @@
64	58	}
65	59	}
66	60
67	61	function bogo_get_user_locale( $user_id = 0 ) {
68		- global $current_user;
69		-
70		- $default_locale = bogo_get_default_locale();
71		- $user_id = absint( $user_id );
72		-
73		- if ( ! $user_id ) {
74		- if ( function_exists( 'wp_get_current_user' ) && ! empty( $current_user ) ) {
75		- $user_id = get_current_user_id();
76		- } elseif ( ! $user_id = apply_filters( 'determine_current_user', false ) ) {
77		- return $default_locale;
78		- }
	62	+ if ( ! $user_id = absint( $user_id ) ) {
	63	+ $user_id = get_current_user_id();
79	64	}
80	65
81	66	$locale = get_user_option( 'locale', $user_id );
82	67
83		- if ( bogo_is_available_locale( $locale )
84		- && ( 'en_US' != $locale || ! bogo_get_prop( 'enus_deactivated' ) )
85		- && user_can( $user_id, 'bogo_access_locale', $locale ) ) {
	68	+ if ( user_can( $user_id, 'bogo_access_locale', $locale ) ) {
86	69	return $locale;
87	70	}
88	71
	72	+ $default_locale = bogo_get_default_locale();
	73	+
89	74	if ( user_can( $user_id, 'bogo_access_locale', $default_locale ) ) {
90	75	return $default_locale;
91	76	}
92	77
93		- $available_locales = bogo_available_locales( array(
94		- 'exclude_enus_if_inactive' => true ) );
95		-
96		- foreach ( $available_locales as $locale ) {
	78	+ foreach ( (array) bogo_available_locales() as $locale ) {
97	79	if ( user_can( $user_id, 'bogo_access_locale', $locale ) ) {
98	80	return $locale;
99	81	}
100	82	}
		@@ -107,12 +89,8 @@
107	89
108	90	$user_id = absint( $user_id );
109	91	$meta_key = $wpdb->get_blog_prefix() . 'accessible_locale';
110	92
111		- $locales = get_user_meta( $user_id, $meta_key );
	93	+ return get_user_meta( $user_id, $meta_key );
	94	+}
112	95
113		- if ( bogo_get_prop( 'enus_deactivated' ) ) {
114		- $locales = array_diff( $locales, array( 'en_US' ) );
115		- }
116		-
117		- return $locales;
118		-}
	96	+?>