PluginProbe
Polylang / 2.1
Polylang v2.1
3.8.9 3.8.8 3.8.7 3.8.6 3.8.5 3.8.4 3.8.3 2.7 2.7.0.1 2.7.1 2.7.2 2.7.3 2.7.4 2.8 2.8.1 2.8.2 2.8.3 2.8.4 2.9 2.9.1 2.9.2 3.0 3.0.1 3.0.2 3.0.3 All 233 releases
← All changes | admin/admin-base.php +118 -174 2.9 → 2.1 View file →
@@ -1,8 +1,5 @@
1 1 <?php
2 -/**
3 - * @package Polylang
4 - */
5 2
6 3 /**
7 4 * Base class for both admin
8 5 *
@@ -21,16 +18,22 @@
21 18 */
22 19 public function __construct( &$links_model ) {
23 20 parent::__construct( $links_model );
24 21
22 + // Plugin i18n, only needed for backend
23 + load_plugin_textdomain( 'polylang', false, basename( POLYLANG_DIR ).'/languages' );
24 +
25 25 // Adds the link to the languages panel in the WordPress admin menu
26 26 add_action( 'admin_menu', array( $this, 'add_menus' ) );
27 27
28 28 // Setup js scripts and css styles
29 29 add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) );
30 - add_action( 'admin_print_footer_scripts', array( $this, 'admin_print_footer_scripts' ), 0 ); // High priority in case an ajax request is sent by an immediately invoked function
30 + add_action( 'admin_print_footer_scripts', array( $this, 'admin_print_footer_scripts' ) );
31 31
32 - add_action( 'customize_controls_enqueue_scripts', array( $this, 'customize_controls_enqueue_scripts' ) );
32 + // Lingotek
33 + if ( ! defined( 'PLL_LINGOTEK_AD' ) || PLL_LINGOTEK_AD ) {
34 + require_once( POLYLANG_DIR . '/lingotek/lingotek.php' );
35 + }
33 36 }
34 37
35 38 /**
36 39 * Setups filters and action needed on all admin pages and on plugins page
@@ -36,14 +39,12 @@
36 39 * Setups filters and action needed on all admin pages and on plugins page
37 40 * Loads the settings pages or the filters base on the request
38 41 *
39 42 * @since 1.2
43 + *
44 + * @param object $links_model
40 45 */
41 46 public function init() {
42 - parent::init();
43 -
44 - $this->notices = new PLL_Admin_Notices( $this );
45 -
46 47 if ( ! $this->model->get_languages_list() ) {
47 48 return;
48 49 }
49 50
@@ -52,9 +53,9 @@
52 53 $this->filters_links = new PLL_Filters_Links( $this ); // FIXME needed here ?
53 54
54 55 // Filter admin language for users
55 56 // We must not call user info before WordPress defines user roles in wp-settings.php
56 - add_action( 'setup_theme', array( $this, 'init_user' ) );
57 + add_filter( 'setup_theme', array( $this, 'init_user' ) );
57 58 add_filter( 'request', array( $this, 'request' ) );
58 59
59 60 // Adds the languages in admin bar
60 61 add_action( 'admin_bar_menu', array( $this, 'admin_bar_menu' ), 100 ); // 100 determines the position
@@ -65,12 +66,10 @@
65 66 *
66 67 * @since 0.1
67 68 */
68 69 public function add_menus() {
69 - global $admin_page_hooks;
70 -
71 70 // Prepare the list of tabs
72 - $tabs = array( 'lang' => __( 'Languages', 'polylang' ) );
71 + $tabs = array( 'lang' => __( 'Languages','polylang' ) );
73 72
74 73 // Only if at least one language has been created
75 74 if ( $this->model->get_languages_list() ) {
76 75 $tabs['strings'] = __( 'Strings translations', 'polylang' );
@@ -86,19 +85,16 @@
86 85 * @param array $tabs list of tab names
87 86 */
88 87 $tabs = apply_filters( 'pll_settings_tabs', $tabs );
89 88
90 - $parent = '';
91 -
92 89 foreach ( $tabs as $tab => $title ) {
93 90 $page = 'lang' === $tab ? 'mlang' : "mlang_$tab";
94 91 if ( empty( $parent ) ) {
95 92 $parent = $page;
96 - add_menu_page( $title, __( 'Languages', 'polylang' ), 'manage_options', $page, null, 'dashicons-translation' );
97 - $admin_page_hooks[ $page ] = 'languages'; // Hack to avoid the localization of the hook name. See: https://core.trac.wordpress.org/ticket/18857
93 + add_menu_page( $title, __( 'Languages','polylang' ), 'manage_options', $page, null , 'dashicons-translation' );
98 94 }
99 95
100 - add_submenu_page( $parent, $title, $title, 'manage_options', $page, array( $this, 'languages_page' ) );
96 + add_submenu_page( $parent, $title, $title, 'manage_options', $page , array( $this, 'languages_page' ) );
101 97 }
102 98 }
103 99
104 100 /**
@@ -113,38 +109,21 @@
113 109 }
114 110
115 111 $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
116 112
117 - /*
118 - * For each script:
119 - * 0 => the pages on which to load the script
120 - * 1 => the scripts it needs to work
121 - * 2 => 1 if loaded even if languages have not been defined yet, 0 otherwise
122 - * 3 => 1 if loaded in footer
123 - */
113 + // For each script:
114 + // 0 => the pages on which to load the script
115 + // 1 => the scripts it needs to work
116 + // 2 => 1 if loaded even if languages have not been defined yet, 0 otherwise
117 + // 3 => 1 if loaded in footer
118 + // FIXME: check if I can load more scripts in footer
124 119 $scripts = array(
125 - 'user' => array( array( 'profile', 'user-edit' ), array( 'jquery' ), 0, 0 ),
126 - 'widgets' => array( array( 'widgets' ), array( 'jquery' ), 0, 0 ),
120 + 'post' => array( array( 'post', 'media', 'async-upload', 'edit' ), array( 'jquery', 'wp-ajax-response', 'post', 'jquery-ui-autocomplete' ), 0 , 1 ),
121 + 'media' => array( array( 'upload' ), array( 'jquery' ), 0 , 1 ),
122 + 'term' => array( array( 'edit-tags', 'term' ), array( 'jquery', 'wp-ajax-response', 'jquery-ui-autocomplete' ), 0, 1 ),
123 + 'user' => array( array( 'profile', 'user-edit' ), array( 'jquery' ), 0 , 0 ),
127 124 );
128 125
129 - if ( ! empty( $screen->post_type ) && $this->model->is_translated_post_type( $screen->post_type ) ) {
130 - $scripts['post'] = array( array( 'edit', 'upload' ), array( 'jquery', 'wp-ajax-response' ), 0, 1 );
131 -
132 - // Classic editor.
133 - if ( ! method_exists( $screen, 'is_block_editor' ) || ! $screen->is_block_editor() ) {
134 - $scripts['classic-editor'] = array( array( 'post', 'media', 'async-upload' ), array( 'jquery', 'wp-ajax-response', 'post' ), 0, 1 );
135 - }
136 -
137 - // Block editor with legacy metabox in WP 5.0+.
138 - if ( method_exists( $screen, 'is_block_editor' ) && $screen->is_block_editor() && ! pll_use_block_editor_plugin() ) {
139 - $scripts['block-editor'] = array( array( 'post' ), array( 'jquery', 'wp-ajax-response', 'wp-api-fetch' ), 0, 1 );
140 - }
141 - }
142 -
143 - if ( ! empty( $screen->taxonomy ) && $this->model->is_translated_taxonomy( $screen->taxonomy ) ) {
144 - $scripts['term'] = array( array( 'edit-tags', 'term' ), array( 'jquery', 'wp-ajax-response', 'jquery-ui-autocomplete' ), 0, 1 );
145 - }
146 -
147 126 foreach ( $scripts as $script => $v ) {
148 127 if ( in_array( $screen->base, $v[0] ) && ( $v[2] || $this->model->get_languages_list() ) ) {
149 128 wp_enqueue_script( 'pll_' . $script, plugins_url( '/js/' . $script . $suffix . '.js', POLYLANG_FILE ), $v[1], POLYLANG_VERSION, $v[3] );
150 129 }
@@ -150,43 +129,11 @@
150 129 }
151 130 }
152 131
153 132 wp_enqueue_style( 'polylang_admin', plugins_url( '/css/admin' . $suffix . '.css', POLYLANG_FILE ), array(), POLYLANG_VERSION );
154 -
155 - $this->localize_scripts();
156 133 }
157 134
158 135 /**
159 - * Enqueue scripts to the WP Customizer.
160 - *
161 - * @since 2.4.0
162 - */
163 - public function customize_controls_enqueue_scripts() {
164 - if ( $this->model->get_languages_list() ) {
165 - $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
166 - wp_enqueue_script( 'pll_widgets', plugins_url( '/js/widgets' . $suffix . '.js', POLYLANG_FILE ), array( 'jquery' ), POLYLANG_VERSION, true );
167 - $this->localize_scripts();
168 - }
169 - }
170 -
171 - /**
172 - * Localize scripts.
173 - *
174 - * @since 2.4.0
175 - */
176 - public function localize_scripts() {
177 - if ( wp_script_is( 'pll_widgets', 'enqueued' ) ) {
178 - wp_localize_script(
179 - 'pll_widgets',
180 - 'pll_widgets',
181 - array(
182 - 'flags' => wp_list_pluck( $this->model->get_languages_list(), 'flag', 'slug' ),
183 - )
184 - );
185 - }
186 - }
187 -
188 - /**
189 136 * Sets pll_ajax_backend on all backend ajax request
190 137 * The final goal is to detect if an ajax request is made on admin or frontend
191 138 *
192 139 * Takes care to various situations:
@@ -199,9 +146,9 @@
199 146 *
200 147 * @since 1.4
201 148 */
202 149 public function admin_print_footer_scripts() {
203 - global $post_ID, $tag_ID;
150 + global $post_ID;
204 151
205 152 $params = array( 'pll_ajax_backend' => 1 );
206 153 if ( ! empty( $post_ID ) ) {
207 154 $params = array_merge( $params, array( 'pll_post_id' => (int) $post_ID ) );
@@ -206,49 +153,42 @@
206 153 if ( ! empty( $post_ID ) ) {
207 154 $params = array_merge( $params, array( 'pll_post_id' => (int) $post_ID ) );
208 155 }
209 156
210 - if ( ! empty( $tag_ID ) ) {
211 - $params = array_merge( $params, array( 'pll_term_id' => (int) $tag_ID ) );
212 - }
213 -
214 157 $str = http_build_query( $params );
215 - $arr = wp_json_encode( $params );
216 - ?>
217 - <script type="text/javascript">
218 - if (typeof jQuery != 'undefined') {
219 - jQuery(
220 - function($){
221 - $.ajaxPrefilter(function (options, originalOptions, jqXHR) {
222 - if ( -1 != options.url.indexOf( ajaxurl ) || -1 != ajaxurl.indexOf( options.url ) ) {
223 - if ( 'undefined' === typeof options.data ) {
224 - options.data = ( 'get' === options.type.toLowerCase() ) ? '<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>' : <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?>;
225 - } else {
226 - if ( 'string' === typeof options.data ) {
227 - if ( '' === options.data && 'get' === options.type.toLowerCase() ) {
228 - options.url = options.url+'&<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>';
229 - } else {
230 - try {
231 - var o = JSON.parse(options.data);
232 - o = $.extend(o, <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?>);
233 - options.data = JSON.stringify(o);
234 - }
235 - catch(e) {
236 - options.data = '<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>&'+options.data;
237 - }
238 - }
239 - } else {
240 - options.data = $.extend(options.data, <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?>);
241 - }
158 + $arr = json_encode( $params );
159 +?>
160 +<script type="text/javascript">
161 + if (typeof jQuery != 'undefined') {
162 + (function($){
163 + $.ajaxPrefilter(function (options, originalOptions, jqXHR) {
164 + if ( -1 != options.url.indexOf( ajaxurl ) || -1 != ajaxurl.indexOf( options.url ) ) {
165 + if ( 'undefined' === typeof options.data ) {
166 + options.data = ( 'get' === options.type.toLowerCase() ) ? '<?php echo $str;?>' : <?php echo $arr;?>;
167 + } else {
168 + if ( 'string' === typeof options.data ) {
169 + if ( '' === options.data && 'get' === options.type.toLowerCase() ) {
170 + options.url = options.url+'&<?php echo $str;?>';
171 + } else {
172 + try {
173 + o = $.parseJSON(options.data);
174 + o = $.extend(o, <?php echo $arr;?>);
175 + options.data = JSON.stringify(o);
242 176 }
177 + catch(e) {
178 + options.data = '<?php echo $str;?>&'+options.data;
179 + }
243 180 }
244 - });
181 + } else {
182 + options.data = $.extend(options.data, <?php echo $arr;?>);
183 + }
245 184 }
246 - );
247 - }
248 - </script>
249 - <?php
185 + }
186 + });
187 + })(jQuery)
250 188 }
189 +</script><?php
190 + }
251 191
252 192 /**
253 193 * Sets the admin current language, used to filter the content
254 194 *
@@ -257,24 +197,23 @@
257 197 public function set_current_language() {
258 198 $this->curlang = $this->filter_lang;
259 199
260 200 // Edit Post
261 - if ( isset( $_REQUEST['pll_post_id'] ) && $lang = $this->model->post->get_language( (int) $_REQUEST['pll_post_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
201 + if ( isset( $_REQUEST['pll_post_id'] ) && $lang = $this->model->post->get_language( (int) $_REQUEST['pll_post_id'] ) ) {
262 202 $this->curlang = $lang;
263 - } elseif ( 'post.php' === $GLOBALS['pagenow'] && isset( $_GET['post'] ) && $this->model->is_translated_post_type( get_post_type( (int) $_GET['post'] ) ) && $lang = $this->model->post->get_language( (int) $_GET['post'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
203 + } elseif ( 'post.php' === $GLOBALS['pagenow'] && isset( $_GET['post'] ) && is_numeric( $_GET['post'] ) && $lang = $this->model->post->get_language( (int) $_GET['post'] ) ) {
264 204 $this->curlang = $lang;
265 - } elseif ( 'post-new.php' === $GLOBALS['pagenow'] && ( empty( $_GET['post_type'] ) || $this->model->is_translated_post_type( sanitize_key( $_GET['post_type'] ) ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification
266 - $this->curlang = empty( $_GET['new_lang'] ) ? $this->pref_lang : $this->model->get_language( sanitize_key( $_GET['new_lang'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
205 + } elseif ( 'post-new.php' === $GLOBALS['pagenow'] && ( empty( $_GET['post_type'] ) || $this->model->is_translated_post_type( $_GET['post_type'] ) ) ) {
206 + $this->curlang = empty( $_GET['new_lang'] ) ? $this->pref_lang : $this->model->get_language( $_GET['new_lang'] );
267 207 }
268 208
269 209 // Edit Term
270 - elseif ( isset( $_REQUEST['pll_term_id'] ) && $lang = $this->model->term->get_language( (int) $_REQUEST['pll_term_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
210 + // FIXME 'edit-tags.php' for backward compatibility with WP < 4.5
211 + elseif ( in_array( $GLOBALS['pagenow'], array( 'edit-tags.php', 'term.php' ) ) && isset( $_GET['tag_ID'] ) && $lang = $this->model->term->get_language( (int) $_GET['tag_ID'] ) ) {
271 212 $this->curlang = $lang;
272 - } elseif ( in_array( $GLOBALS['pagenow'], array( 'edit-tags.php', 'term.php' ) ) && isset( $_GET['taxonomy'] ) && $this->model->is_translated_taxonomy( sanitize_key( $_GET['taxonomy'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification
273 - if ( isset( $_GET['tag_ID'] ) && $lang = $this->model->term->get_language( (int) $_GET['tag_ID'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
274 - $this->curlang = $lang;
275 - } elseif ( ! empty( $_GET['new_lang'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
276 - $this->curlang = $this->model->get_language( sanitize_key( $_GET['new_lang'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
213 + } elseif ( 'edit-tags.php' === $GLOBALS['pagenow'] && isset( $_GET['taxonomy'] ) && $this->model->is_translated_taxonomy( $_GET['taxonomy'] ) ) {
214 + if ( ! empty( $_GET['new_lang'] ) ) {
215 + $this->curlang = $this->model->get_language( $_GET['new_lang'] );
277 216 } elseif ( empty( $this->curlang ) ) {
278 217 $this->curlang = $this->pref_lang;
279 218 }
280 219 }
@@ -279,20 +218,11 @@
279 218 }
280 219 }
281 220
282 221 // Ajax
283 - if ( wp_doing_ajax() && ! empty( $_REQUEST['lang'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
284 - $this->curlang = $this->model->get_language( sanitize_key( $_REQUEST['lang'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
222 + if ( defined( 'DOING_AJAX' ) && DOING_AJAX && ! empty( $_REQUEST['lang'] ) ) {
223 + $this->curlang = $this->model->get_language( $_REQUEST['lang'] );
285 224 }
286 -
287 - // Inform that the admin language has been set.
288 - if ( $this->curlang ) {
289 - /** This action is documented in frontend/choose-lang.php */
290 - do_action( 'pll_language_defined', $this->curlang->slug, $this->curlang );
291 - } else {
292 - /** This action is documented in include/class-polylang.php */
293 - do_action( 'pll_no_language_defined' ); // To load overridden textdomains.
294 - }
295 225 }
296 226
297 227 /**
298 228 * Defines the backend language and the admin language filter based on user preferences
@@ -299,13 +229,18 @@
299 229 *
300 230 * @since 1.2.3
301 231 */
302 232 public function init_user() {
233 + // Backend locale
234 + // FIXME: Backward compatibility with WP < 4.7
235 + if ( version_compare( $GLOBALS['wp_version'], '4.7alpha', '<' ) ) {
236 + add_filter( 'locale', array( $this, 'get_locale' ) );
237 + }
238 +
303 239 // Language for admin language filter: may be empty
304 240 // $_GET['lang'] is numeric when editing a language, not when selecting a new language in the filter
305 - // We intentionally don't use a nonce to update the language filter
306 - if ( ! wp_doing_ajax() && ! empty( $_GET['lang'] ) && ! is_numeric( sanitize_key( $_GET['lang'] ) ) && current_user_can( 'edit_user', $user_id = get_current_user_id() ) ) { // phpcs:ignore WordPress.Security.NonceVerification
307 - update_user_meta( $user_id, 'pll_filter_content', ( $lang = $this->model->get_language( sanitize_key( $_GET['lang'] ) ) ) ? $lang->slug : '' ); // phpcs:ignore WordPress.Security.NonceVerification
241 + if ( ! defined( 'DOING_AJAX' ) && ! empty( $_GET['lang'] ) && ! is_numeric( $_GET['lang'] ) && current_user_can( 'edit_user', $user_id = get_current_user_id() ) ) {
242 + update_user_meta( $user_id, 'pll_filter_content', ( $lang = $this->model->get_language( $_GET['lang'] ) ) ? $lang->slug : '' );
308 243 }
309 244
310 245 $this->filter_lang = $this->model->get_language( get_user_meta( get_current_user_id(), 'pll_filter_content', true ) );
311 246
@@ -312,9 +247,9 @@
312 247 // Set preferred language for use when saving posts and terms: must not be empty
313 248 $this->pref_lang = empty( $this->filter_lang ) ? $this->model->get_language( $this->options['default_lang'] ) : $this->filter_lang;
314 249
315 250 /**
316 - * Filter the preferred language on admin side
251 + * Filter the preferred language on amin side
317 252 * The preferred language is used for example to determine the language of a new post
318 253 *
319 254 * @since 1.2.3
320 255 *
@@ -323,18 +258,29 @@
323 258 $this->pref_lang = apply_filters( 'pll_admin_preferred_language', $this->pref_lang );
324 259
325 260 $this->set_current_language();
326 261
327 - // Plugin i18n, only needed for backend.
328 - load_plugin_textdomain( 'polylang' );
262 + // Inform that the admin language has been set
263 + // Only if the admin language is one of the Polylang defined language
264 + if ( $curlang = $this->model->get_language( get_locale() ) ) {
265 + // FIXME: Backward compatibility with WP < 4.7
266 + if ( version_compare( $GLOBALS['wp_version'], '4.7alpha', '<' ) ) {
267 + $GLOBALS['text_direction'] = $curlang->is_rtl ? 'rtl' : 'ltr'; // force text direction according to language setting
268 + }
269 +
270 + /** This action is documented in frontend/choose-lang.php */
271 + do_action( 'pll_language_defined', $curlang->slug, $curlang );
272 + } else {
273 + /** This action is documented in include/class-polylang.php */
274 + do_action( 'pll_no_language_defined' ); // to load overriden textdomains
275 + }
329 276 }
330 277
331 278 /**
332 279 * Avoids parsing a tax query when all languages are requested
333 280 * Fixes https://wordpress.org/support/topic/notice-undefined-offset-0-in-wp-includesqueryphp-on-line-3877 introduced in WP 4.1
281 + * @see the suggestion of @boonebgorges, https://core.trac.wordpress.org/ticket/31246
334 282 *
335 - * @see https://core.trac.wordpress.org/ticket/31246 the suggestion of @boonebgorges.
336 - *
337 283 * @since 1.6.5
338 284 *
339 285 * @param array $qvars
340 286 * @return array
@@ -347,8 +293,21 @@
347 293 return $qvars;
348 294 }
349 295
350 296 /**
297 + * Get the locale based on user preference
298 + * FIXME: Backward compatibility with WP < 4.7
299 + *
300 + * @since 0.4
301 + *
302 + * @param string $locale
303 + * @return string modified locale
304 + */
305 + public function get_locale( $locale ) {
306 + return ( $loc = get_user_meta( get_current_user_id(), 'locale', 'true' ) ) ? $loc : $locale;
307 + }
308 +
309 + /**
351 310 * Adds the languages list in admin bar for the admin languages filter
352 311 *
353 312 * @since 0.9
354 313 *
@@ -354,8 +313,10 @@
354 313 *
355 314 * @param object $wp_admin_bar
356 315 */
357 316 public function admin_bar_menu( $wp_admin_bar ) {
317 + $url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
318 +
358 319 $all_item = (object) array(
359 320 'slug' => 'all',
360 321 'name' => __( 'Show all languages', 'polylang' ),
361 322 'flag' => '<span class="ab-icon"></span>',
@@ -363,47 +324,30 @@
363 324
364 325 $selected = empty( $this->filter_lang ) ? $all_item : $this->filter_lang;
365 326
366 327 $title = sprintf(
367 - '<span class="ab-label"%1$s><span class="screen-reader-text">%2$s</span>%3$s</span>',
328 + '<span class="ab-label"%s>%s</span>',
368 329 'all' === $selected->slug ? '' : sprintf( ' lang="%s"', esc_attr( $selected->get_locale( 'display' ) ) ),
369 - __( 'Filters content by language', 'polylang' ),
370 330 esc_html( $selected->name )
371 331 );
372 332
373 - /**
374 - * Filters the admin languages filter submenu items
375 - *
376 - * @since 2.6
377 - *
378 - * @param array $items The admin languages filter submenu items.
379 - */
380 - $items = apply_filters( 'pll_admin_languages_filter', array_merge( array( $all_item ), $this->model->get_languages_list() ) );
333 + $wp_admin_bar->add_menu( array(
334 + 'id' => 'languages',
335 + 'title' => $selected->flag . $title,
336 + 'meta' => array( 'title' => __( 'Filters content by language', 'polylang' ) ),
337 + ) );
381 338
382 - if ( ! empty( $items ) ) {
383 - $wp_admin_bar->add_menu(
384 - array(
385 - 'id' => 'languages',
386 - 'title' => $selected->flag . $title,
387 - 'href' => esc_url( add_query_arg( 'lang', $selected->slug, remove_query_arg( 'paged' ) ) ),
388 - 'meta' => array( 'title' => __( 'Filters content by language', 'polylang' ) ),
389 - )
390 - );
391 - }
392 -
393 - foreach ( $items as $lang ) {
339 + foreach ( array_merge( array( $all_item ), $this->model->get_languages_list() ) as $lang ) {
394 340 if ( $selected->slug === $lang->slug ) {
395 341 continue;
396 342 }
397 343
398 - $wp_admin_bar->add_menu(
399 - array(
400 - 'parent' => 'languages',
401 - 'id' => $lang->slug,
402 - 'title' => $lang->flag . esc_html( $lang->name ),
403 - 'href' => esc_url( add_query_arg( 'lang', $lang->slug, remove_query_arg( 'paged' ) ) ),
404 - 'meta' => 'all' === $lang->slug ? array() : array( 'lang' => esc_attr( $lang->get_locale( 'display' ) ) ),
405 - )
406 - );
344 + $wp_admin_bar->add_menu( array(
345 + 'parent' => 'languages',
346 + 'id' => $lang->slug,
347 + 'title' => $lang->flag . esc_html( $lang->name ),
348 + 'href' => esc_url( add_query_arg( 'lang', $lang->slug, remove_query_arg( 'paged', $url ) ) ),
349 + 'meta' => 'all' === $lang->slug ? array() : array( 'lang' => esc_attr( $lang->get_locale( 'display' ) ) ),
350 + ) );
407 351 }
408 352 }
409 353 }