| @@ -11,9 +11,9 @@ | ||
| 11 | 11 | abstract class PLL_Admin_Base extends PLL_Base { |
| 12 | 12 | /** |
| 13 | 13 | * Current language (used to filter the content). |
| 14 | 14 | * |
| 15 | - * @var PLL_Language | |
| 15 | + * @var PLL_Language|null | |
| 16 | 16 | */ |
| 17 | 17 | public $curlang; |
| 18 | 18 | |
| 19 | 19 | /** |
| @@ -18,9 +18,9 @@ | ||
| 18 | 18 | |
| 19 | 19 | /** |
| 20 | 20 | * Language selected in the admin language filter. |
| 21 | 21 | * |
| 22 | - * @var PLL_Language | |
| 22 | + * @var PLL_Language|null | |
| 23 | 23 | */ |
| 24 | 24 | public $filter_lang; |
| 25 | 25 | |
| 26 | 26 | /** |
| @@ -25,33 +25,38 @@ | ||
| 25 | 25 | |
| 26 | 26 | /** |
| 27 | 27 | * Preferred language to assign to new contents. |
| 28 | 28 | * |
| 29 | - * @var PLL_Language | |
| 29 | + * @var PLL_Language|null | |
| 30 | 30 | */ |
| 31 | 31 | public $pref_lang; |
| 32 | 32 | |
| 33 | 33 | /** |
| 34 | - * @var PLL_Filters_Links | |
| 34 | + * @var PLL_Filters_Links|null | |
| 35 | 35 | */ |
| 36 | 36 | public $filters_links; |
| 37 | 37 | |
| 38 | 38 | /** |
| 39 | - * @var PLL_Admin_Links | |
| 39 | + * @var PLL_Admin_Links|null | |
| 40 | 40 | */ |
| 41 | 41 | public $links; |
| 42 | 42 | |
| 43 | 43 | /** |
| 44 | - * @var PLL_Admin_Notices | |
| 44 | + * @var PLL_Admin_Notices|null | |
| 45 | 45 | */ |
| 46 | 46 | public $notices; |
| 47 | 47 | |
| 48 | 48 | /** |
| 49 | - * @var PLL_Admin_Static_Pages | |
| 49 | + * @var PLL_Admin_Static_Pages|null | |
| 50 | 50 | */ |
| 51 | 51 | public $static_pages; |
| 52 | 52 | |
| 53 | 53 | /** |
| 54 | + * @var PLL_Admin_Default_Term|null | |
| 55 | + */ | |
| 56 | + public $default_term; | |
| 57 | + | |
| 58 | + /** | |
| 54 | 59 | * Setups actions needed on all admin pages. |
| 55 | 60 | * |
| 56 | 61 | * @since 1.8 |
| 57 | 62 | * |
| @@ -62,13 +67,18 @@ | ||
| 62 | 67 | |
| 63 | 68 | // Adds the link to the languages panel in the WordPress admin menu |
| 64 | 69 | add_action( 'admin_menu', array( $this, 'add_menus' ) ); |
| 65 | 70 | |
| 71 | + add_action( 'admin_menu', array( $this, 'remove_customize_submenu' ) ); | |
| 72 | + | |
| 66 | 73 | // Setup js scripts and css styles |
| 67 | - add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) ); | |
| 68 | - 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 | |
| 74 | + add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ), 0 ); // High priority in case an ajax request is sent by an immediately invoked function | |
| 69 | 75 | |
| 70 | 76 | add_action( 'customize_controls_enqueue_scripts', array( $this, 'customize_controls_enqueue_scripts' ) ); |
| 77 | + | |
| 78 | + // Early instantiated to be able to correctly initialize language properties. | |
| 79 | + $this->static_pages = new PLL_Admin_Static_Pages( $this ); | |
| 80 | + $this->model->set_languages_ready(); | |
| 71 | 81 | } |
| 72 | 82 | |
| 73 | 83 | /** |
| 74 | 84 | * Setups filters and action needed on all admin pages and on plugins page |
| @@ -80,14 +90,16 @@ | ||
| 80 | 90 | parent::init(); |
| 81 | 91 | |
| 82 | 92 | $this->notices = new PLL_Admin_Notices( $this ); |
| 83 | 93 | |
| 84 | - if ( ! $this->model->get_languages_list() ) { | |
| 94 | + $this->default_term = new PLL_Admin_Default_Term( $this ); | |
| 95 | + $this->default_term->add_hooks(); | |
| 96 | + | |
| 97 | + if ( ! $this->model->has_languages() ) { | |
| 85 | 98 | return; |
| 86 | 99 | } |
| 87 | 100 | |
| 88 | 101 | $this->links = new PLL_Admin_Links( $this ); // FIXME needed here ? |
| 89 | - $this->static_pages = new PLL_Admin_Static_Pages( $this ); // FIXME needed here ? | |
| 90 | 102 | $this->filters_links = new PLL_Filters_Links( $this ); // FIXME needed here ? |
| 91 | 103 | |
| 92 | 104 | // Filter admin language for users |
| 93 | 105 | // We must not call user info before WordPress defines user roles in wp-settings.php |
| @@ -111,10 +123,10 @@ | ||
| 111 | 123 | // Prepare the list of tabs |
| 112 | 124 | $tabs = array( 'lang' => __( 'Languages', 'polylang' ) ); |
| 113 | 125 | |
| 114 | 126 | // Only if at least one language has been created |
| 115 | - if ( $this->model->get_languages_list() ) { | |
| 116 | - $tabs['strings'] = __( 'Strings translations', 'polylang' ); | |
| 127 | + if ( $this->model->has_languages() ) { | |
| 128 | + $tabs['strings'] = __( 'Translations', 'polylang' ); | |
| 117 | 129 | } |
| 118 | 130 | |
| 119 | 131 | $tabs['settings'] = __( 'Settings', 'polylang' ); |
| 120 | 132 | |
| @@ -141,8 +153,18 @@ | ||
| 141 | 153 | } |
| 142 | 154 | } |
| 143 | 155 | |
| 144 | 156 | /** |
| 157 | + * Dummy method to display the 3 tabs pages: languages, strings translations, settings. | |
| 158 | + * Overwritten in `PLL_Settings`. | |
| 159 | + * | |
| 160 | + * @since 3.7 | |
| 161 | + * | |
| 162 | + * @return void | |
| 163 | + */ | |
| 164 | + public function languages_page() {} | |
| 165 | + | |
| 166 | + /** | |
| 145 | 167 | * Setup js scripts & css styles ( only on the relevant pages ) |
| 146 | 168 | * |
| 147 | 169 | * @since 0.6 |
| 148 | 170 | * |
| @@ -148,61 +170,86 @@ | ||
| 148 | 170 | * |
| 149 | 171 | * @return void |
| 150 | 172 | */ |
| 151 | 173 | public function admin_enqueue_scripts() { |
| 174 | + $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; | |
| 175 | + | |
| 176 | + wp_enqueue_script( 'pll_admin', plugins_url( "/js/build/admin{$suffix}.js", POLYLANG_ROOT_FILE ), array( 'jquery' ), POLYLANG_VERSION, true ); | |
| 177 | + $inline_script = sprintf( 'let pll_admin = %s;', wp_json_encode( array( 'ajax_filter' => $this->get_ajax_filter_data() ) ) ); | |
| 178 | + wp_add_inline_script( 'pll_admin', $inline_script, 'before' ); | |
| 179 | + | |
| 152 | 180 | $screen = get_current_screen(); |
| 153 | 181 | if ( empty( $screen ) ) { |
| 154 | 182 | return; |
| 155 | 183 | } |
| 156 | 184 | |
| 157 | - $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; | |
| 158 | - | |
| 159 | 185 | /* |
| 160 | 186 | * For each script: |
| 161 | 187 | * 0 => the pages on which to load the script |
| 162 | 188 | * 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 | |
| 189 | + * 2 => true if loaded even if languages have not been defined yet, false otherwise | |
| 190 | + * 3 => true if loaded in footer | |
| 165 | 191 | */ |
| 166 | 192 | $scripts = array( |
| 167 | - 'user' => array( array( 'profile', 'user-edit' ), array( 'jquery' ), 0, 0 ), | |
| 168 | - 'widgets' => array( array( 'widgets' ), array( 'jquery' ), 0, 0 ), | |
| 193 | + 'user' => array( array( 'profile', 'user-edit' ), array( 'jquery' ), false, false ), | |
| 194 | + 'widgets' => array( array( 'widgets' ), array( 'jquery' ), false, false ), | |
| 169 | 195 | ); |
| 170 | 196 | |
| 197 | + $block_screens = array( 'widgets', 'site-editor' ); | |
| 198 | + | |
| 171 | 199 | 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 ); | |
| 200 | + $scripts['post'] = array( array( 'edit' ), array( 'jquery', 'wp-ajax-response' ), false, true ); | |
| 173 | 201 | |
| 174 | 202 | // Classic editor. |
| 175 | 203 | 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', 'wp-i18n' ), 0, 1 ); | |
| 204 | + $scripts['classic-editor'] = array( array( 'post', 'media', 'async-upload' ), array( 'jquery', 'wp-ajax-response', 'post', 'jquery-ui-dialog', 'wp-i18n' ), false, true ); | |
| 177 | 205 | } |
| 178 | 206 | |
| 179 | 207 | // 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', 'wp-i18n' ), 0, 1 ); | |
| 182 | - } | |
| 208 | + $block_screens[] = 'post'; | |
| 183 | 209 | } |
| 184 | 210 | |
| 211 | + if ( $this->options['media_support'] ) { | |
| 212 | + $scripts['media'] = array( array( 'upload' ), array( 'jquery' ), false, true ); | |
| 213 | + } | |
| 214 | + | |
| 215 | + if ( $this->is_block_editor( $screen ) ) { | |
| 216 | + $scripts['block-editor'] = array( $block_screens, array( 'jquery', 'wp-ajax-response', 'wp-api-fetch', 'jquery-ui-dialog', 'wp-i18n' ), false, true ); | |
| 217 | + } | |
| 218 | + | |
| 185 | 219 | 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 ); | |
| 220 | + $scripts['term'] = array( array( 'edit-tags', 'term' ), array( 'jquery', 'wp-ajax-response', 'jquery-ui-autocomplete' ), false, true ); | |
| 187 | 221 | } |
| 188 | 222 | |
| 189 | 223 | foreach ( $scripts as $script => $v ) { |
| 190 | - 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_ROOT_FILE ), $v[1], POLYLANG_VERSION, $v[3] ); | |
| 224 | + if ( in_array( $screen->base, $v[0] ) && ( $v[2] || $this->model->has_languages() ) ) { | |
| 225 | + wp_enqueue_script( "pll_{$script}", plugins_url( "/js/build/{$script}{$suffix}.js", POLYLANG_ROOT_FILE ), $v[1], POLYLANG_VERSION, $v[3] ); | |
| 192 | 226 | if ( 'classic-editor' === $script || 'block-editor' === $script ) { |
| 193 | - wp_set_script_translations( 'pll_' . $script, 'polylang' ); | |
| 227 | + wp_set_script_translations( "pll_{$script}", 'polylang' ); | |
| 194 | 228 | } |
| 195 | 229 | } |
| 196 | 230 | } |
| 197 | 231 | |
| 198 | - wp_register_style( 'polylang_admin', plugins_url( '/css/build/admin' . $suffix . '.css', POLYLANG_ROOT_FILE ), array( 'wp-jquery-ui-dialog' ), POLYLANG_VERSION ); | |
| 199 | - wp_enqueue_style( 'polylang_dialog', plugins_url( '/css/build/dialog' . $suffix . '.css', POLYLANG_ROOT_FILE ), array( 'polylang_admin' ), POLYLANG_VERSION ); | |
| 232 | + wp_register_style( 'polylang_admin', plugins_url( "/css/build/admin{$suffix}.css", POLYLANG_ROOT_FILE ), array( 'wp-jquery-ui-dialog' ), POLYLANG_VERSION ); | |
| 233 | + wp_enqueue_style( 'polylang_dialog', plugins_url( "/css/build/dialog{$suffix}.css", POLYLANG_ROOT_FILE ), array( 'polylang_admin' ), POLYLANG_VERSION ); | |
| 200 | 234 | |
| 201 | - $this->localize_scripts(); | |
| 235 | + $this->add_inline_scripts(); | |
| 202 | 236 | } |
| 203 | 237 | |
| 204 | 238 | /** |
| 239 | + * Tells whether or not the given screen is block editor kind. | |
| 240 | + * e.g. widget, site or post editor. | |
| 241 | + * | |
| 242 | + * @since 3.3 | |
| 243 | + * | |
| 244 | + * @param WP_Screen $screen Screen object. | |
| 245 | + * @return bool True if the screen is a block editor, false otherwise. | |
| 246 | + */ | |
| 247 | + protected function is_block_editor( $screen ) { | |
| 248 | + return method_exists( $screen, 'is_block_editor' ) && $screen->is_block_editor() && ! pll_use_block_editor_plugin(); | |
| 249 | + } | |
| 250 | + | |
| 251 | + /** | |
| 205 | 252 | * Enqueue scripts to the WP Customizer. |
| 206 | 253 | * |
| 207 | 254 | * @since 2.4.0 |
| 208 | 255 | * |
| @@ -208,23 +255,32 @@ | ||
| 208 | 255 | * |
| 209 | 256 | * @return void |
| 210 | 257 | */ |
| 211 | 258 | public function customize_controls_enqueue_scripts() { |
| 212 | - if ( $this->model->get_languages_list() ) { | |
| 259 | + if ( $this->model->has_languages() ) { | |
| 213 | 260 | $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; |
| 214 | 261 | wp_enqueue_script( 'pll_widgets', plugins_url( '/js/build/widgets' . $suffix . '.js', POLYLANG_ROOT_FILE ), array( 'jquery' ), POLYLANG_VERSION, true ); |
| 215 | - $this->localize_scripts(); | |
| 262 | + $this->add_inline_scripts(); | |
| 216 | 263 | } |
| 217 | 264 | } |
| 218 | 265 | |
| 219 | 266 | /** |
| 220 | - * Localize scripts. | |
| 267 | + * Adds inline scripts to set the default language in JS | |
| 268 | + * and localizes scripts. | |
| 221 | 269 | * |
| 222 | - * @since 2.4.0 | |
| 270 | + * @since 3.3 | |
| 223 | 271 | * |
| 224 | 272 | * @return void |
| 225 | 273 | */ |
| 226 | - public function localize_scripts() { | |
| 274 | + private function add_inline_scripts() { | |
| 275 | + if ( wp_script_is( 'pll_block-editor', 'enqueued' ) ) { | |
| 276 | + $default_lang_script = 'const pllDefaultLanguage = "' . $this->options['default_lang'] . '";'; | |
| 277 | + wp_add_inline_script( | |
| 278 | + 'pll_block-editor', | |
| 279 | + $default_lang_script, | |
| 280 | + 'before' | |
| 281 | + ); | |
| 282 | + } | |
| 227 | 283 | if ( wp_script_is( 'pll_widgets', 'enqueued' ) ) { |
| 228 | 284 | wp_localize_script( |
| 229 | 285 | 'pll_widgets', |
| 230 | 286 | 'pll_widgets', |
| @@ -235,79 +291,43 @@ | ||
| 235 | 291 | } |
| 236 | 292 | } |
| 237 | 293 | |
| 238 | 294 | /** |
| 239 | - * Sets pll_ajax_backend on all backend ajax request | |
| 240 | - * The final goal is to detect if an ajax request is made on admin or frontend | |
| 295 | + * Returns the data to use with the AJAX filter. | |
| 296 | + * The final goal is to detect if an ajax request is made on admin or frontend. | |
| 241 | 297 | * |
| 242 | 298 | * Takes care to various situations: |
| 243 | - * when the ajax request has no options.data thanks to ScreenfeedFr | |
| 244 | - * see: https://wordpress.org/support/topic/ajaxprefilter-may-not-work-as-expected | |
| 245 | - * when options.data is a json string | |
| 246 | - * see: https://wordpress.org/support/topic/polylang-breaking-third-party-ajax-requests-on-admin-panels | |
| 247 | - * when options.data is an empty string (GET request with the method 'load') | |
| 248 | - * see: https://wordpress.org/support/topic/invalid-url-during-wordpress-new-dashboard-widget-operation | |
| 299 | + * - When the AJAX request has no `options.data` thanks to ScreenfeedFr. | |
| 300 | + * See: https://wordpress.org/support/topic/ajaxprefilter-may-not-work-as-expected. | |
| 301 | + * - When `options.data` is a JSON string. | |
| 302 | + * See: https://wordpress.org/support/topic/polylang-breaking-third-party-ajax-requests-on-admin-panels. | |
| 303 | + * - When `options.data` is an empty string (GET request with the method 'load'). | |
| 304 | + * See: https://wordpress.org/support/topic/invalid-url-during-wordpress-new-dashboard-widget-operation. | |
| 249 | 305 | * |
| 250 | - * @since 1.4 | |
| 306 | + * @since 3.7 | |
| 251 | 307 | * |
| 252 | - * @return void | |
| 308 | + * @return array | |
| 253 | 309 | */ |
| 254 | - public function admin_print_footer_scripts() { | |
| 255 | - global $post_ID, $tag_ID; | |
| 310 | + public function get_ajax_filter_data(): array { | |
| 311 | + global $post, $tag; | |
| 256 | 312 | |
| 257 | 313 | $params = array( 'pll_ajax_backend' => 1 ); |
| 258 | - if ( ! empty( $post_ID ) ) { | |
| 259 | - $params = array_merge( $params, array( 'pll_post_id' => (int) $post_ID ) ); | |
| 314 | + if ( $post instanceof WP_Post && $this->model->post_types->is_translated( $post->post_type ) ) { | |
| 315 | + $params['pll_post_id'] = $post->ID; | |
| 260 | 316 | } |
| 261 | 317 | |
| 262 | - if ( ! empty( $tag_ID ) ) { | |
| 263 | - $params = array_merge( $params, array( 'pll_term_id' => (int) $tag_ID ) ); | |
| 318 | + if ( $tag instanceof WP_Term && $this->model->taxonomies->is_translated( $tag->taxonomy ) ) { | |
| 319 | + $params['pll_term_id'] = $tag->term_id; | |
| 264 | 320 | } |
| 265 | 321 | |
| 266 | - $str = http_build_query( $params ); | |
| 267 | - $arr = wp_json_encode( $params ); | |
| 268 | - ?> | |
| 269 | - <script type="text/javascript"> | |
| 270 | - if (typeof jQuery != 'undefined') { | |
| 271 | - jQuery( | |
| 272 | - function( $ ){ | |
| 273 | - $.ajaxPrefilter( function ( options, originalOptions, jqXHR ) { | |
| 274 | - if ( -1 != options.url.indexOf( ajaxurl ) || -1 != ajaxurl.indexOf( options.url ) ) { | |
| 275 | - | |
| 276 | - function addStringParameters() { | |
| 277 | - if ( 'undefined' === typeof options.data || '' === options.data ) { | |
| 278 | - options.data = '<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>'; | |
| 279 | - } else { | |
| 280 | - options.data = options.data + '&<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>'; | |
| 281 | - } | |
| 282 | - } | |
| 283 | - | |
| 284 | - /* | |
| 285 | - * options.processData set to true is the default jQuery process where the data is converted in a query string by using jQuery.param(). | |
| 286 | - * This step is done before applying filters. Thus here the options.data is already a string in this case. | |
| 287 | - * @See https://github.com/jquery/jquery/blob/3.5.1/src/ajax.js#L563-L569 jQuery ajax function. | |
| 288 | - */ | |
| 289 | - if ( options.processData ) { | |
| 290 | - addStringParameters(); | |
| 291 | - } else { | |
| 292 | - /* | |
| 293 | - * If options.processData is set to false data could be undefined or pass as a string. | |
| 294 | - * So data as to be processed as if options.processData is set to true. | |
| 295 | - */ | |
| 296 | - if ( 'undefined' === typeof options.data || 'string' === typeof options.data ) { | |
| 297 | - addStringParameters(); | |
| 298 | - } else { | |
| 299 | - // Otherwise options.data is probably an object. | |
| 300 | - options.data = Object.assign( options.data, <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?> ); | |
| 301 | - } | |
| 302 | - } | |
| 303 | - } | |
| 304 | - }); | |
| 305 | - } | |
| 306 | - ); | |
| 307 | - } | |
| 308 | - </script> | |
| 309 | - <?php | |
| 322 | + /** | |
| 323 | + * Filters the list of parameters to add to the admin ajax request. | |
| 324 | + * | |
| 325 | + * @since 3.4.5 | |
| 326 | + * | |
| 327 | + * @param array $params List of parameters to add to the admin ajax request. | |
| 328 | + */ | |
| 329 | + return (array) apply_filters( 'pll_admin_ajax_params', $params ); | |
| 310 | 330 | } |
| 311 | 331 | |
| 312 | 332 | /** |
| 313 | 333 | * Sets the admin current language, used to filter the content |
| @@ -345,10 +365,20 @@ | ||
| 345 | 365 | if ( wp_doing_ajax() && ! empty( $_REQUEST['lang'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification |
| 346 | 366 | $this->curlang = $this->model->get_language( sanitize_key( $_REQUEST['lang'] ) ); // phpcs:ignore WordPress.Security.NonceVerification |
| 347 | 367 | } |
| 348 | 368 | |
| 369 | + /** | |
| 370 | + * Filters the current language used by Polylang in the admin context. | |
| 371 | + * | |
| 372 | + * @since 3.2 | |
| 373 | + * | |
| 374 | + * @param PLL_Language|false|null $curlang Instance of the current language. | |
| 375 | + * @param PLL_Admin_Base $polylang Instance of the main Polylang's object. | |
| 376 | + */ | |
| 377 | + $this->curlang = apply_filters( 'pll_admin_current_language', $this->curlang, $this ); | |
| 378 | + | |
| 349 | 379 | // Inform that the admin language has been set. |
| 350 | - if ( $this->curlang ) { | |
| 380 | + if ( $this->curlang instanceof PLL_Language ) { | |
| 351 | 381 | /** This action is documented in frontend/choose-lang.php */ |
| 352 | 382 | do_action( 'pll_language_defined', $this->curlang->slug, $this->curlang ); |
| 353 | 383 | } else { |
| 354 | 384 | /** This action is documented in include/class-polylang.php */ |
| @@ -373,9 +403,9 @@ | ||
| 373 | 403 | |
| 374 | 404 | $this->filter_lang = $this->model->get_language( get_user_meta( get_current_user_id(), 'pll_filter_content', true ) ); |
| 375 | 405 | |
| 376 | 406 | // Set preferred language for use when saving posts and terms: must not be empty |
| 377 | - $this->pref_lang = empty( $this->filter_lang ) ? $this->model->get_language( $this->options['default_lang'] ) : $this->filter_lang; | |
| 407 | + $this->pref_lang = empty( $this->filter_lang ) ? $this->model->get_default_language() : $this->filter_lang; | |
| 378 | 408 | |
| 379 | 409 | /** |
| 380 | 410 | * Filters the preferred language on admin side. |
| 381 | 411 | * The preferred language is used for example to determine the language of a new post. |
| @@ -386,11 +416,8 @@ | ||
| 386 | 416 | */ |
| 387 | 417 | $this->pref_lang = apply_filters( 'pll_admin_preferred_language', $this->pref_lang ); |
| 388 | 418 | |
| 389 | 419 | $this->set_current_language(); |
| 390 | - | |
| 391 | - // Plugin i18n, only needed for backend. | |
| 392 | - load_plugin_textdomain( 'polylang' ); | |
| 393 | 420 | } |
| 394 | 421 | |
| 395 | 422 | /** |
| 396 | 423 | * Avoids parsing a tax query when all languages are requested |
| @@ -399,9 +426,9 @@ | ||
| 399 | 426 | * @see https://core.trac.wordpress.org/ticket/31246 the suggestion of @boonebgorges. |
| 400 | 427 | * |
| 401 | 428 | * @since 1.6.5 |
| 402 | 429 | * |
| 403 | - * @param array $qvars | |
| 430 | + * @param array $qvars The array of requested query variables. | |
| 404 | 431 | * @return array |
| 405 | 432 | */ |
| 406 | 433 | public function request( $qvars ) { |
| 407 | 434 | if ( isset( $qvars['lang'] ) && 'all' === $qvars['lang'] ) { |
| @@ -429,9 +456,9 @@ | ||
| 429 | 456 | $selected = empty( $this->filter_lang ) ? $all_item : $this->filter_lang; |
| 430 | 457 | |
| 431 | 458 | $title = sprintf( |
| 432 | 459 | '<span class="ab-label"%1$s><span class="screen-reader-text">%2$s</span>%3$s</span>', |
| 433 | - 'all' === $selected->slug ? '' : sprintf( ' lang="%s"', esc_attr( $selected->get_locale( 'display' ) ) ), | |
| 460 | + $selected instanceof PLL_Language ? sprintf( ' lang="%s"', esc_attr( $selected->get_locale( 'display' ) ) ) : '', | |
| 434 | 461 | __( 'Filters content by language', 'polylang' ), |
| 435 | 462 | esc_html( $selected->name ) |
| 436 | 463 | ); |
| 437 | 464 | |
| @@ -443,17 +470,23 @@ | ||
| 443 | 470 | * @param array $items The admin languages filter submenu items. |
| 444 | 471 | */ |
| 445 | 472 | $items = apply_filters( 'pll_admin_languages_filter', array_merge( array( $all_item ), $this->model->get_languages_list() ) ); |
| 446 | 473 | |
| 474 | + $menu = array( | |
| 475 | + 'id' => 'languages', | |
| 476 | + 'title' => $selected->flag . $title, | |
| 477 | + 'href' => esc_url( add_query_arg( 'lang', $selected->slug, remove_query_arg( 'paged' ) ) ), | |
| 478 | + 'meta' => array( | |
| 479 | + 'title' => __( 'Filters content by language', 'polylang' ), | |
| 480 | + ), | |
| 481 | + ); | |
| 482 | + | |
| 483 | + if ( 'all' !== $selected->slug ) { | |
| 484 | + $menu['meta']['class'] = 'pll-filtered-languages'; | |
| 485 | + } | |
| 486 | + | |
| 447 | 487 | if ( ! empty( $items ) ) { |
| 448 | - $wp_admin_bar->add_menu( | |
| 449 | - array( | |
| 450 | - 'id' => 'languages', | |
| 451 | - 'title' => $selected->flag . $title, | |
| 452 | - 'href' => esc_url( add_query_arg( 'lang', $selected->slug, remove_query_arg( 'paged' ) ) ), | |
| 453 | - 'meta' => array( 'title' => __( 'Filters content by language', 'polylang' ) ), | |
| 454 | - ) | |
| 455 | - ); | |
| 488 | + $wp_admin_bar->add_menu( $menu ); | |
| 456 | 489 | } |
| 457 | 490 | |
| 458 | 491 | foreach ( $items as $lang ) { |
| 459 | 492 | if ( $selected->slug === $lang->slug ) { |
| @@ -468,7 +501,34 @@ | ||
| 468 | 501 | 'href' => esc_url( add_query_arg( 'lang', $lang->slug, remove_query_arg( 'paged' ) ) ), |
| 469 | 502 | 'meta' => 'all' === $lang->slug ? array() : array( 'lang' => esc_attr( $lang->get_locale( 'display' ) ) ), |
| 470 | 503 | ) |
| 471 | 504 | ); |
| 505 | + } | |
| 506 | + } | |
| 507 | + | |
| 508 | + /** | |
| 509 | + * Remove the customize submenu when using a block theme. | |
| 510 | + * | |
| 511 | + * WordPress removes the Customizer menu if a block theme is activated and no other plugins interact with it. | |
| 512 | + * As Polylang interacts with the Customizer, we have to delete this menu ourselves in the case of a block theme, | |
| 513 | + * unless another plugin than Polylang interacts with the Customizer. | |
| 514 | + * | |
| 515 | + * @since 3.2 | |
| 516 | + * | |
| 517 | + * @return void | |
| 518 | + */ | |
| 519 | + public function remove_customize_submenu() { | |
| 520 | + if ( ! $this->should_customize_menu_be_removed() ) { | |
| 521 | + return; | |
| 522 | + } | |
| 523 | + | |
| 524 | + global $submenu; | |
| 525 | + | |
| 526 | + if ( ! empty( $submenu['themes.php'] ) ) { | |
| 527 | + foreach ( $submenu['themes.php'] as $submenu_item ) { | |
| 528 | + if ( 'customize' === $submenu_item[1] ) { | |
| 529 | + remove_submenu_page( 'themes.php', $submenu_item[2] ); | |
| 530 | + } | |
| 531 | + } | |
| 472 | 532 | } |
| 473 | 533 | } |
| 474 | 534 | } |
