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