| @@ -1,66 +1,28 @@ | ||
| 1 | 1 | <?php |
| 2 | -/** | |
| 3 | - * @package Polylang | |
| 4 | - */ | |
| 5 | 2 | |
| 6 | 3 | /** |
| 7 | - * Setup features available on all admin pages. | |
| 4 | + * Base class for both admin | |
| 8 | 5 | * |
| 9 | 6 | * @since 1.8 |
| 10 | 7 | */ |
| 11 | -abstract class PLL_Admin_Base extends PLL_Base { | |
| 12 | - /** | |
| 13 | - * Current language (used to filter the content). | |
| 14 | - * | |
| 15 | - * @var PLL_Language | |
| 16 | - */ | |
| 17 | - public $curlang; | |
| 8 | +class PLL_Admin_Base extends PLL_Base { | |
| 9 | + public $filter_lang, $curlang, $pref_lang; | |
| 18 | 10 | |
| 19 | 11 | /** |
| 20 | - * Language selected in the admin language filter. | |
| 12 | + * Loads the polylang text domain | |
| 13 | + * Setups actions needed on all admin pages | |
| 21 | 14 | * |
| 22 | - * @var PLL_Language | |
| 23 | - */ | |
| 24 | - public $filter_lang; | |
| 25 | - | |
| 26 | - /** | |
| 27 | - * Preferred language to assign to new contents. | |
| 28 | - * | |
| 29 | - * @var PLL_Language | |
| 30 | - */ | |
| 31 | - public $pref_lang; | |
| 32 | - | |
| 33 | - /** | |
| 34 | - * @var PLL_Filters_Links | |
| 35 | - */ | |
| 36 | - public $filters_links; | |
| 37 | - | |
| 38 | - /** | |
| 39 | - * @var PLL_Admin_Links | |
| 40 | - */ | |
| 41 | - public $links; | |
| 42 | - | |
| 43 | - /** | |
| 44 | - * @var PLL_Admin_Notices | |
| 45 | - */ | |
| 46 | - public $notices; | |
| 47 | - | |
| 48 | - /** | |
| 49 | - * @var PLL_Admin_Static_Pages | |
| 50 | - */ | |
| 51 | - public $static_pages; | |
| 52 | - | |
| 53 | - /** | |
| 54 | - * Setups actions needed on all admin pages. | |
| 55 | - * | |
| 56 | 15 | * @since 1.8 |
| 57 | 16 | * |
| 58 | - * @param PLL_Links_Model $links_model Reference to the links model. | |
| 17 | + * @param object $links_model | |
| 59 | 18 | */ |
| 60 | 19 | public function __construct( &$links_model ) { |
| 61 | 20 | parent::__construct( $links_model ); |
| 62 | 21 | |
| 22 | + // Plugin i18n, only needed for backend | |
| 23 | + load_plugin_textdomain( 'polylang', false, basename( POLYLANG_DIR ) . '/languages' ); | |
| 24 | + | |
| 63 | 25 | // Adds the link to the languages panel in the WordPress admin menu |
| 64 | 26 | add_action( 'admin_menu', array( $this, 'add_menus' ) ); |
| 65 | 27 | |
| 66 | 28 | // Setup js scripts and css styles |
| @@ -67,8 +29,13 @@ | ||
| 67 | 29 | add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) ); |
| 68 | 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 |
| 69 | 31 | |
| 70 | 32 | add_action( 'customize_controls_enqueue_scripts', array( $this, 'customize_controls_enqueue_scripts' ) ); |
| 33 | + | |
| 34 | + // Lingotek | |
| 35 | + if ( ! defined( 'POLYLANG_PRO' ) && ( ! defined( 'PLL_LINGOTEK_AD' ) || PLL_LINGOTEK_AD ) ) { | |
| 36 | + require_once POLYLANG_DIR . '/lingotek/lingotek.php'; | |
| 37 | + } | |
| 71 | 38 | } |
| 72 | 39 | |
| 73 | 40 | /** |
| 74 | 41 | * Setups filters and action needed on all admin pages and on plugins page |
| @@ -76,16 +43,13 @@ | ||
| 76 | 43 | * |
| 77 | 44 | * @since 1.2 |
| 78 | 45 | */ |
| 79 | 46 | public function init() { |
| 80 | - parent::init(); | |
| 81 | - | |
| 82 | - $this->notices = new PLL_Admin_Notices( $this ); | |
| 83 | - | |
| 84 | 47 | if ( ! $this->model->get_languages_list() ) { |
| 85 | 48 | return; |
| 86 | 49 | } |
| 87 | 50 | |
| 51 | + $this->notices = new PLL_Admin_Notices( $this ); | |
| 88 | 52 | $this->links = new PLL_Admin_Links( $this ); // FIXME needed here ? |
| 89 | 53 | $this->static_pages = new PLL_Admin_Static_Pages( $this ); // FIXME needed here ? |
| 90 | 54 | $this->filters_links = new PLL_Filters_Links( $this ); // FIXME needed here ? |
| 91 | 55 | |
| @@ -90,9 +54,9 @@ | ||
| 90 | 54 | $this->filters_links = new PLL_Filters_Links( $this ); // FIXME needed here ? |
| 91 | 55 | |
| 92 | 56 | // Filter admin language for users |
| 93 | 57 | // We must not call user info before WordPress defines user roles in wp-settings.php |
| 94 | - add_action( 'setup_theme', array( $this, 'init_user' ) ); | |
| 58 | + add_filter( 'setup_theme', array( $this, 'init_user' ) ); | |
| 95 | 59 | add_filter( 'request', array( $this, 'request' ) ); |
| 96 | 60 | |
| 97 | 61 | // Adds the languages in admin bar |
| 98 | 62 | add_action( 'admin_bar_menu', array( $this, 'admin_bar_menu' ), 100 ); // 100 determines the position |
| @@ -101,14 +65,10 @@ | ||
| 101 | 65 | /** |
| 102 | 66 | * Adds the link to the languages panel in the WordPress admin menu |
| 103 | 67 | * |
| 104 | 68 | * @since 0.1 |
| 105 | - * | |
| 106 | - * @return void | |
| 107 | 69 | */ |
| 108 | 70 | public function add_menus() { |
| 109 | - global $admin_page_hooks; | |
| 110 | - | |
| 111 | 71 | // Prepare the list of tabs |
| 112 | 72 | $tabs = array( 'lang' => __( 'Languages', 'polylang' ) ); |
| 113 | 73 | |
| 114 | 74 | // Only if at least one language has been created |
| @@ -126,16 +86,13 @@ | ||
| 126 | 86 | * @param array $tabs list of tab names |
| 127 | 87 | */ |
| 128 | 88 | $tabs = apply_filters( 'pll_settings_tabs', $tabs ); |
| 129 | 89 | |
| 130 | - $parent = ''; | |
| 131 | - | |
| 132 | 90 | foreach ( $tabs as $tab => $title ) { |
| 133 | 91 | $page = 'lang' === $tab ? 'mlang' : "mlang_$tab"; |
| 134 | 92 | if ( empty( $parent ) ) { |
| 135 | 93 | $parent = $page; |
| 136 | - add_menu_page( $title, __( 'Languages', 'polylang' ), 'manage_options', $page, '__return_null', 'dashicons-translation' ); | |
| 137 | - $admin_page_hooks[ $page ] = 'languages'; // Hack to avoid the localization of the hook name. See: https://core.trac.wordpress.org/ticket/18857 | |
| 94 | + add_menu_page( $title, __( 'Languages', 'polylang' ), 'manage_options', $page, null, 'dashicons-translation' ); | |
| 138 | 95 | } |
| 139 | 96 | |
| 140 | 97 | add_submenu_page( $parent, $title, $title, 'manage_options', $page, array( $this, 'languages_page' ) ); |
| 141 | 98 | } |
| @@ -144,10 +101,8 @@ | ||
| 144 | 101 | /** |
| 145 | 102 | * Setup js scripts & css styles ( only on the relevant pages ) |
| 146 | 103 | * |
| 147 | 104 | * @since 0.6 |
| 148 | - * | |
| 149 | - * @return void | |
| 150 | 105 | */ |
| 151 | 106 | public function admin_enqueue_scripts() { |
| 152 | 107 | $screen = get_current_screen(); |
| 153 | 108 | if ( empty( $screen ) ) { |
| @@ -155,46 +110,38 @@ | ||
| 155 | 110 | } |
| 156 | 111 | |
| 157 | 112 | $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; |
| 158 | 113 | |
| 159 | - /* | |
| 160 | - * For each script: | |
| 161 | - * 0 => the pages on which to load the script | |
| 162 | - * 1 => the scripts it needs to work | |
| 163 | - * 2 => 1 if loaded even if languages have not been defined yet, 0 otherwise | |
| 164 | - * 3 => 1 if loaded in footer | |
| 165 | - */ | |
| 114 | + // For each script: | |
| 115 | + // 0 => the pages on which to load the script | |
| 116 | + // 1 => the scripts it needs to work | |
| 117 | + // 2 => 1 if loaded even if languages have not been defined yet, 0 otherwise | |
| 118 | + // 3 => 1 if loaded in footer | |
| 119 | + // FIXME: check if I can load more scripts in footer | |
| 166 | 120 | $scripts = array( |
| 167 | - 'user' => array( array( 'profile', 'user-edit' ), array( 'jquery' ), 0, 0 ), | |
| 168 | - 'widgets' => array( array( 'widgets' ), array( 'jquery' ), 0, 0 ), | |
| 121 | + 'post' => array( array( 'edit' ), array( 'jquery', 'wp-ajax-response' ), 0, 1 ), | |
| 122 | + 'media' => array( array( 'upload' ), array( 'jquery' ), 0, 1 ), | |
| 123 | + 'term' => array( array( 'edit-tags', 'term' ), array( 'jquery', 'wp-ajax-response', 'jquery-ui-autocomplete' ), 0, 1 ), | |
| 124 | + 'user' => array( array( 'profile', 'user-edit' ), array( 'jquery' ), 0, 0 ), | |
| 125 | + 'widgets' => array( array( 'widgets' ), array( 'jquery' ), 0, 0 ), | |
| 169 | 126 | ); |
| 170 | 127 | |
| 171 | 128 | if ( ! empty( $screen->post_type ) && $this->model->is_translated_post_type( $screen->post_type ) ) { |
| 172 | - $scripts['post'] = array( array( 'edit', 'upload' ), array( 'jquery', 'wp-ajax-response' ), 0, 1 ); | |
| 129 | + $scripts['classic-editor'] = array( array( 'post', 'media', 'async-upload' ), array( 'jquery', 'wp-ajax-response', 'post', 'jquery-ui-autocomplete' ), 0, 1 ); | |
| 173 | 130 | |
| 174 | - // Classic editor. | |
| 175 | - if ( ! method_exists( $screen, 'is_block_editor' ) || ! $screen->is_block_editor() ) { | |
| 176 | - $scripts['classic-editor'] = array( array( 'post', 'media', 'async-upload' ), array( 'jquery', 'wp-ajax-response', 'post', 'jquery-ui-dialog' ), 0, 1 ); | |
| 131 | + // Block editor in WP 5.0+ | |
| 132 | + if ( method_exists( $screen, 'is_block_editor' ) && $screen->is_block_editor() ) { | |
| 133 | + $scripts['block-editor'] = array( array( 'post' ), array( 'wp-api-fetch' ), 0, 1 ); | |
| 177 | 134 | } |
| 178 | - | |
| 179 | - // Block editor with legacy metabox in WP 5.0+. | |
| 180 | - if ( method_exists( $screen, 'is_block_editor' ) && $screen->is_block_editor() && ! pll_use_block_editor_plugin() ) { | |
| 181 | - $scripts['block-editor'] = array( array( 'post' ), array( 'jquery', 'wp-ajax-response', 'wp-api-fetch', 'jquery-ui-dialog' ), 0, 1 ); | |
| 182 | - } | |
| 183 | 135 | } |
| 184 | 136 | |
| 185 | - if ( ! empty( $screen->taxonomy ) && $this->model->is_translated_taxonomy( $screen->taxonomy ) ) { | |
| 186 | - $scripts['term'] = array( array( 'edit-tags', 'term' ), array( 'jquery', 'wp-ajax-response', 'jquery-ui-autocomplete' ), 0, 1 ); | |
| 187 | - } | |
| 188 | - | |
| 189 | 137 | foreach ( $scripts as $script => $v ) { |
| 190 | 138 | if ( in_array( $screen->base, $v[0] ) && ( $v[2] || $this->model->get_languages_list() ) ) { |
| 191 | - wp_enqueue_script( 'pll_' . $script, plugins_url( '/js/build/' . $script . $suffix . '.js', POLYLANG_BASENAME ), $v[1], POLYLANG_VERSION, $v[3] ); | |
| 139 | + wp_enqueue_script( 'pll_' . $script, plugins_url( '/js/' . $script . $suffix . '.js', POLYLANG_FILE ), $v[1], POLYLANG_VERSION, $v[3] ); | |
| 192 | 140 | } |
| 193 | 141 | } |
| 194 | 142 | |
| 195 | - wp_register_style( 'polylang_admin', plugins_url( '/css/build/admin' . $suffix . '.css', POLYLANG_BASENAME ), array( 'wp-jquery-ui-dialog' ), POLYLANG_VERSION ); | |
| 196 | - wp_enqueue_style( 'polylang_dialog', plugins_url( '/css/build/dialog' . $suffix . '.css', POLYLANG_BASENAME ), array( 'polylang_admin' ), POLYLANG_VERSION ); | |
| 143 | + wp_enqueue_style( 'polylang_admin', plugins_url( '/css/admin' . $suffix . '.css', POLYLANG_FILE ), array(), POLYLANG_VERSION ); | |
| 197 | 144 | |
| 198 | 145 | $this->localize_scripts(); |
| 199 | 146 | } |
| 200 | 147 | |
| @@ -201,15 +148,13 @@ | ||
| 201 | 148 | /** |
| 202 | 149 | * Enqueue scripts to the WP Customizer. |
| 203 | 150 | * |
| 204 | 151 | * @since 2.4.0 |
| 205 | - * | |
| 206 | - * @return void | |
| 207 | 152 | */ |
| 208 | 153 | public function customize_controls_enqueue_scripts() { |
| 209 | 154 | if ( $this->model->get_languages_list() ) { |
| 210 | 155 | $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; |
| 211 | - wp_enqueue_script( 'pll_widgets', plugins_url( '/js/build/widgets' . $suffix . '.js', POLYLANG_BASENAME ), array( 'jquery' ), POLYLANG_VERSION, true ); | |
| 156 | + wp_enqueue_script( 'pll_widgets', plugins_url( '/js/widgets' . $suffix . '.js', POLYLANG_FILE ), array( 'jquery' ), POLYLANG_VERSION, true ); | |
| 212 | 157 | $this->localize_scripts(); |
| 213 | 158 | } |
| 214 | 159 | } |
| 215 | 160 | |
| @@ -216,10 +161,8 @@ | ||
| 216 | 161 | /** |
| 217 | 162 | * Localize scripts. |
| 218 | 163 | * |
| 219 | 164 | * @since 2.4.0 |
| 220 | - * | |
| 221 | - * @return void | |
| 222 | 165 | */ |
| 223 | 166 | public function localize_scripts() { |
| 224 | 167 | if ( wp_script_is( 'pll_widgets', 'enqueued' ) ) { |
| 225 | 168 | wp_localize_script( |
| @@ -244,10 +187,8 @@ | ||
| 244 | 187 | * when options.data is an empty string (GET request with the method 'load') |
| 245 | 188 | * see: https://wordpress.org/support/topic/invalid-url-during-wordpress-new-dashboard-widget-operation |
| 246 | 189 | * |
| 247 | 190 | * @since 1.4 |
| 248 | - * | |
| 249 | - * @return void | |
| 250 | 191 | */ |
| 251 | 192 | public function admin_print_footer_scripts() { |
| 252 | 193 | global $post_ID, $tag_ID; |
| 253 | 194 | |
| @@ -260,48 +201,38 @@ | ||
| 260 | 201 | $params = array_merge( $params, array( 'pll_term_id' => (int) $tag_ID ) ); |
| 261 | 202 | } |
| 262 | 203 | |
| 263 | 204 | $str = http_build_query( $params ); |
| 264 | - $arr = wp_json_encode( $params ); | |
| 205 | + $arr = json_encode( $params ); | |
| 265 | 206 | ?> |
| 266 | 207 | <script type="text/javascript"> |
| 267 | 208 | if (typeof jQuery != 'undefined') { |
| 268 | - jQuery( | |
| 269 | - function( $ ){ | |
| 270 | - $.ajaxPrefilter( function ( options, originalOptions, jqXHR ) { | |
| 271 | - if ( -1 != options.url.indexOf( ajaxurl ) || -1 != ajaxurl.indexOf( options.url ) ) { | |
| 272 | - | |
| 273 | - function addStringParameters() { | |
| 274 | - if ( 'undefined' === typeof options.data || '' === options.data ) { | |
| 275 | - options.data = '<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>'; | |
| 209 | + (function($){ | |
| 210 | + $.ajaxPrefilter(function (options, originalOptions, jqXHR) { | |
| 211 | + if ( -1 != options.url.indexOf( ajaxurl ) || -1 != ajaxurl.indexOf( options.url ) ) { | |
| 212 | + if ( 'undefined' === typeof options.data ) { | |
| 213 | + options.data = ( 'get' === options.type.toLowerCase() ) ? '<?php echo $str; ?>' : <?php echo $arr; ?>; | |
| 214 | + } else { | |
| 215 | + if ( 'string' === typeof options.data ) { | |
| 216 | + if ( '' === options.data && 'get' === options.type.toLowerCase() ) { | |
| 217 | + options.url = options.url+'&<?php echo $str; ?>'; | |
| 276 | 218 | } else { |
| 277 | - options.data = options.data + '&<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>'; | |
| 219 | + try { | |
| 220 | + var o = $.parseJSON(options.data); | |
| 221 | + o = $.extend(o, <?php echo $arr; ?>); | |
| 222 | + options.data = JSON.stringify(o); | |
| 223 | + } | |
| 224 | + catch(e) { | |
| 225 | + options.data = '<?php echo $str; ?>&'+options.data; | |
| 226 | + } | |
| 278 | 227 | } |
| 279 | - } | |
| 280 | - | |
| 281 | - /* | |
| 282 | - * options.processData set to true is the default jQuery process where the data is converted in a query string by using jQuery.param(). | |
| 283 | - * This step is done before applying filters. Thus here the options.data is already a string in this case. | |
| 284 | - * @See https://github.com/jquery/jquery/blob/3.5.1/src/ajax.js#L563-L569 jQuery ajax function. | |
| 285 | - */ | |
| 286 | - if ( options.processData ) { | |
| 287 | - addStringParameters(); | |
| 288 | 228 | } else { |
| 289 | - /* | |
| 290 | - * If options.processData is set to false data could be undefined or pass as a string. | |
| 291 | - * So data as to be processed as if options.processData is set to true. | |
| 292 | - */ | |
| 293 | - if ( 'undefined' === typeof options.data || 'string' === typeof options.data ) { | |
| 294 | - addStringParameters(); | |
| 295 | - } else { | |
| 296 | - // Otherwise options.data is probably an object. | |
| 297 | - options.data = Object.assign( options.data, <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?> ); | |
| 298 | - } | |
| 229 | + options.data = $.extend(options.data, <?php echo $arr; ?>); | |
| 299 | 230 | } |
| 300 | 231 | } |
| 301 | - }); | |
| 302 | - } | |
| 303 | - ); | |
| 232 | + } | |
| 233 | + }); | |
| 234 | + })(jQuery) | |
| 304 | 235 | } |
| 305 | 236 | </script> |
| 306 | 237 | <?php |
| 307 | 238 | } |
| @@ -309,31 +240,30 @@ | ||
| 309 | 240 | /** |
| 310 | 241 | * Sets the admin current language, used to filter the content |
| 311 | 242 | * |
| 312 | 243 | * @since 2.0 |
| 313 | - * | |
| 314 | - * @return void | |
| 315 | 244 | */ |
| 316 | 245 | public function set_current_language() { |
| 317 | 246 | $this->curlang = $this->filter_lang; |
| 318 | 247 | |
| 319 | 248 | // Edit Post |
| 320 | - if ( isset( $_REQUEST['pll_post_id'] ) && $lang = $this->model->post->get_language( (int) $_REQUEST['pll_post_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 249 | + if ( isset( $_REQUEST['pll_post_id'] ) && $lang = $this->model->post->get_language( (int) $_REQUEST['pll_post_id'] ) ) { | |
| 321 | 250 | $this->curlang = $lang; |
| 322 | - } 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 | |
| 251 | + } elseif ( 'post.php' === $GLOBALS['pagenow'] && isset( $_GET['post'] ) && is_numeric( $_GET['post'] ) && $lang = $this->model->post->get_language( (int) $_GET['post'] ) ) { | |
| 323 | 252 | $this->curlang = $lang; |
| 324 | - } 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 | |
| 325 | - $this->curlang = empty( $_GET['new_lang'] ) ? $this->pref_lang : $this->model->get_language( sanitize_key( $_GET['new_lang'] ) ); // phpcs:ignore WordPress.Security.NonceVerification | |
| 253 | + } elseif ( 'post-new.php' === $GLOBALS['pagenow'] && ( empty( $_GET['post_type'] ) || $this->model->is_translated_post_type( $_GET['post_type'] ) ) ) { | |
| 254 | + $this->curlang = empty( $_GET['new_lang'] ) ? $this->pref_lang : $this->model->get_language( $_GET['new_lang'] ); | |
| 326 | 255 | } |
| 327 | 256 | |
| 328 | 257 | // Edit Term |
| 329 | - elseif ( isset( $_REQUEST['pll_term_id'] ) && $lang = $this->model->term->get_language( (int) $_REQUEST['pll_term_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 258 | + // FIXME 'edit-tags.php' for backward compatibility with WP < 4.5 | |
| 259 | + 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'] ) ) { | |
| 330 | 260 | $this->curlang = $lang; |
| 331 | - } 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 | |
| 332 | - if ( isset( $_GET['tag_ID'] ) && $lang = $this->model->term->get_language( (int) $_GET['tag_ID'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 333 | - $this->curlang = $lang; | |
| 334 | - } elseif ( ! empty( $_GET['new_lang'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 335 | - $this->curlang = $this->model->get_language( sanitize_key( $_GET['new_lang'] ) ); // phpcs:ignore WordPress.Security.NonceVerification | |
| 261 | + } elseif ( isset( $_REQUEST['pll_term_id'] ) && $lang = $this->model->term->get_language( (int) $_REQUEST['pll_term_id'] ) ) { | |
| 262 | + $this->curlang = $lang; | |
| 263 | + } elseif ( 'edit-tags.php' === $GLOBALS['pagenow'] && isset( $_GET['taxonomy'] ) && $this->model->is_translated_taxonomy( $_GET['taxonomy'] ) ) { | |
| 264 | + if ( ! empty( $_GET['new_lang'] ) ) { | |
| 265 | + $this->curlang = $this->model->get_language( $_GET['new_lang'] ); | |
| 336 | 266 | } elseif ( empty( $this->curlang ) ) { |
| 337 | 267 | $this->curlang = $this->pref_lang; |
| 338 | 268 | } |
| 339 | 269 | } |
| @@ -338,20 +268,11 @@ | ||
| 338 | 268 | } |
| 339 | 269 | } |
| 340 | 270 | |
| 341 | 271 | // Ajax |
| 342 | - if ( wp_doing_ajax() && ! empty( $_REQUEST['lang'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 343 | - $this->curlang = $this->model->get_language( sanitize_key( $_REQUEST['lang'] ) ); // phpcs:ignore WordPress.Security.NonceVerification | |
| 272 | + if ( wp_doing_ajax() && ! empty( $_REQUEST['lang'] ) ) { | |
| 273 | + $this->curlang = $this->model->get_language( $_REQUEST['lang'] ); | |
| 344 | 274 | } |
| 345 | - | |
| 346 | - // Inform that the admin language has been set. | |
| 347 | - if ( $this->curlang ) { | |
| 348 | - /** This action is documented in frontend/choose-lang.php */ | |
| 349 | - do_action( 'pll_language_defined', $this->curlang->slug, $this->curlang ); | |
| 350 | - } else { | |
| 351 | - /** This action is documented in include/class-polylang.php */ | |
| 352 | - do_action( 'pll_no_language_defined' ); // To load overridden textdomains. | |
| 353 | - } | |
| 354 | 275 | } |
| 355 | 276 | |
| 356 | 277 | /** |
| 357 | 278 | * Defines the backend language and the admin language filter based on user preferences |
| @@ -356,17 +277,14 @@ | ||
| 356 | 277 | /** |
| 357 | 278 | * Defines the backend language and the admin language filter based on user preferences |
| 358 | 279 | * |
| 359 | 280 | * @since 1.2.3 |
| 360 | - * | |
| 361 | - * @return void | |
| 362 | 281 | */ |
| 363 | 282 | public function init_user() { |
| 364 | 283 | // Language for admin language filter: may be empty |
| 365 | 284 | // $_GET['lang'] is numeric when editing a language, not when selecting a new language in the filter |
| 366 | - // We intentionally don't use a nonce to update the language filter | |
| 367 | - 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 | |
| 368 | - update_user_meta( $user_id, 'pll_filter_content', ( $lang = $this->model->get_language( sanitize_key( $_GET['lang'] ) ) ) ? $lang->slug : '' ); // phpcs:ignore WordPress.Security.NonceVerification | |
| 285 | + if ( ! wp_doing_ajax() && ! empty( $_GET['lang'] ) && ! is_numeric( $_GET['lang'] ) && current_user_can( 'edit_user', $user_id = get_current_user_id() ) ) { | |
| 286 | + update_user_meta( $user_id, 'pll_filter_content', ( $lang = $this->model->get_language( $_GET['lang'] ) ) ? $lang->slug : '' ); | |
| 369 | 287 | } |
| 370 | 288 | |
| 371 | 289 | $this->filter_lang = $this->model->get_language( get_user_meta( get_current_user_id(), 'pll_filter_content', true ) ); |
| 372 | 290 | |
| @@ -373,21 +291,28 @@ | ||
| 373 | 291 | // Set preferred language for use when saving posts and terms: must not be empty |
| 374 | 292 | $this->pref_lang = empty( $this->filter_lang ) ? $this->model->get_language( $this->options['default_lang'] ) : $this->filter_lang; |
| 375 | 293 | |
| 376 | 294 | /** |
| 377 | - * Filters the preferred language on admin side. | |
| 378 | - * The preferred language is used for example to determine the language of a new post. | |
| 295 | + * Filter the preferred language on admin side | |
| 296 | + * The preferred language is used for example to determine the language of a new post | |
| 379 | 297 | * |
| 380 | 298 | * @since 1.2.3 |
| 381 | 299 | * |
| 382 | - * @param PLL_Language $pref_lang Preferred language. | |
| 300 | + * @param object $pref_lang preferred language | |
| 383 | 301 | */ |
| 384 | 302 | $this->pref_lang = apply_filters( 'pll_admin_preferred_language', $this->pref_lang ); |
| 385 | 303 | |
| 386 | 304 | $this->set_current_language(); |
| 387 | 305 | |
| 388 | - // Plugin i18n, only needed for backend. | |
| 389 | - load_plugin_textdomain( 'polylang' ); | |
| 306 | + // Inform that the admin language has been set | |
| 307 | + // Only if the admin language is one of the Polylang defined language | |
| 308 | + if ( $curlang = $this->model->get_language( get_user_locale() ) ) { | |
| 309 | + /** This action is documented in frontend/choose-lang.php */ | |
| 310 | + do_action( 'pll_language_defined', $curlang->slug, $curlang ); | |
| 311 | + } else { | |
| 312 | + /** This action is documented in include/class-polylang.php */ | |
| 313 | + do_action( 'pll_no_language_defined' ); // to load overridden textdomains | |
| 314 | + } | |
| 390 | 315 | } |
| 391 | 316 | |
| 392 | 317 | /** |
| 393 | 318 | * Avoids parsing a tax query when all languages are requested |
| @@ -392,9 +317,9 @@ | ||
| 392 | 317 | /** |
| 393 | 318 | * Avoids parsing a tax query when all languages are requested |
| 394 | 319 | * Fixes https://wordpress.org/support/topic/notice-undefined-offset-0-in-wp-includesqueryphp-on-line-3877 introduced in WP 4.1 |
| 395 | 320 | * |
| 396 | - * @see https://core.trac.wordpress.org/ticket/31246 the suggestion of @boonebgorges. | |
| 321 | + * @see the suggestion of @boonebgorges, https://core.trac.wordpress.org/ticket/31246 | |
| 397 | 322 | * |
| 398 | 323 | * @since 1.6.5 |
| 399 | 324 | * |
| 400 | 325 | * @param array $qvars |
| @@ -408,14 +333,13 @@ | ||
| 408 | 333 | return $qvars; |
| 409 | 334 | } |
| 410 | 335 | |
| 411 | 336 | /** |
| 412 | - * Adds the languages list in admin bar for the admin languages filter. | |
| 337 | + * Adds the languages list in admin bar for the admin languages filter | |
| 413 | 338 | * |
| 414 | 339 | * @since 0.9 |
| 415 | 340 | * |
| 416 | - * @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar global object. | |
| 417 | - * @return void | |
| 341 | + * @param object $wp_admin_bar | |
| 418 | 342 | */ |
| 419 | 343 | public function admin_bar_menu( $wp_admin_bar ) { |
| 420 | 344 | $all_item = (object) array( |
| 421 | 345 | 'slug' => 'all', |
| @@ -431,29 +355,18 @@ | ||
| 431 | 355 | __( 'Filters content by language', 'polylang' ), |
| 432 | 356 | esc_html( $selected->name ) |
| 433 | 357 | ); |
| 434 | 358 | |
| 435 | - /** | |
| 436 | - * Filters the admin languages filter submenu items | |
| 437 | - * | |
| 438 | - * @since 2.6 | |
| 439 | - * | |
| 440 | - * @param array $items The admin languages filter submenu items. | |
| 441 | - */ | |
| 442 | - $items = apply_filters( 'pll_admin_languages_filter', array_merge( array( $all_item ), $this->model->get_languages_list() ) ); | |
| 359 | + $wp_admin_bar->add_menu( | |
| 360 | + array( | |
| 361 | + 'id' => 'languages', | |
| 362 | + 'title' => $selected->flag . $title, | |
| 363 | + 'href' => esc_url( add_query_arg( 'lang', $selected->slug, remove_query_arg( 'paged' ) ) ), | |
| 364 | + 'meta' => array( 'title' => __( 'Filters content by language', 'polylang' ) ), | |
| 365 | + ) | |
| 366 | + ); | |
| 443 | 367 | |
| 444 | - if ( ! empty( $items ) ) { | |
| 445 | - $wp_admin_bar->add_menu( | |
| 446 | - array( | |
| 447 | - 'id' => 'languages', | |
| 448 | - 'title' => $selected->flag . $title, | |
| 449 | - 'href' => esc_url( add_query_arg( 'lang', $selected->slug, remove_query_arg( 'paged' ) ) ), | |
| 450 | - 'meta' => array( 'title' => __( 'Filters content by language', 'polylang' ) ), | |
| 451 | - ) | |
| 452 | - ); | |
| 453 | - } | |
| 454 | - | |
| 455 | - foreach ( $items as $lang ) { | |
| 368 | + foreach ( array_merge( array( $all_item ), $this->model->get_languages_list() ) as $lang ) { | |
| 456 | 369 | if ( $selected->slug === $lang->slug ) { |
| 457 | 370 | continue; |
| 458 | 371 | } |
| 459 | 372 | |
