| @@ -7,84 +7,34 @@ | ||
| 7 | 7 | * Admin side controller |
| 8 | 8 | * accessible in $polylang global object |
| 9 | 9 | * |
| 10 | 10 | * Properties: |
| 11 | - * options => inherited, reference to Polylang options array | |
| 12 | - * model => inherited, reference to PLL_Model object | |
| 13 | - * links_model => inherited, reference to PLL_Links_Model object | |
| 14 | - * links => inherited, reference to PLL_Admin_Links object | |
| 15 | - * static_pages => inherited, reference to PLL_Admin_Static_Pages object | |
| 16 | - * filters_links => inherited, reference to PLL_Filters_Links object | |
| 17 | - * curlang => inherited, optional, current language used to filter the content (language of the post or term being edited, equal to filter_lang otherwise) | |
| 18 | - * filter_lang => inherited, optional, current status of the admin languages filter (in the admin bar) | |
| 19 | - * pref_lang => inherited, preferred language used as default when saving posts or terms | |
| 20 | - * posts => reference to PLL_CRUD_Posts object | |
| 21 | - * terms => reference to PLL_CRUD_Terms object | |
| 22 | - * filters => reference to PLL_Admin_Filters object | |
| 23 | - * filters_sanitization => reference to PLL_Filters_Sanitization object | |
| 24 | - * filters_columns => reference to PLL_Admin_Filters_Columns object | |
| 25 | - * filters_post => reference to PLL_Admin_Filters_Post object | |
| 26 | - * filters_term => reference to PLL_Admin_filters_Term object | |
| 27 | - * nav_menu => reference to PLL_Admin_Nav_Menu object | |
| 28 | - * block_editor => reference to PLL_Admin_Block_Editor object | |
| 29 | - * classic_editor => reference to PLL_Admin_Classic_Editor object | |
| 30 | - * filters_media => optional, reference to PLL_Admin_Filters_Media object | |
| 11 | + * options => inherited, reference to Polylang options array | |
| 12 | + * model => inherited, reference to PLL_Model object | |
| 13 | + * links_model => inherited, reference to PLL_Links_Model object | |
| 14 | + * links => inherited, reference to PLL_Admin_Links object | |
| 15 | + * static_pages => inherited, reference to PLL_Admin_Static_Pages object | |
| 16 | + * filters_links => inherited, reference to PLL_Filters_Links object | |
| 17 | + * curlang => inherited, optional, current language used to filter the content (language of the post or term being edited, equal to filter_lang otherwise) | |
| 18 | + * filter_lang => inherited, optional, current status of the admin languages filter (in the admin bar) | |
| 19 | + * pref_lang => inherited, preferred language used as default when saving posts or terms | |
| 20 | + * posts => reference to PLL_CRUD_Posts object | |
| 21 | + * terms => reference to PLL_CRUD_Terms object | |
| 22 | + * filters => reference to PLL_Admin_Filters object | |
| 23 | + * filters_columns => reference to PLL_Admin_Filters_Columns object | |
| 24 | + * filters_post => reference to PLL_Admin_Filters_Post object | |
| 25 | + * filters_term => reference to PLL_Admin_filters_Term object | |
| 26 | + * nav_menu => reference to PLL_Admin_Nav_Menu object | |
| 27 | + * block_editor => reference to PLL_Admin_Block_Editor object | |
| 28 | + * classic_editor => reference to PLL_Admin_Classic_Editor object | |
| 29 | + * filters_media => optional, reference to PLL_Admin_Filters_Media object | |
| 31 | 30 | * |
| 32 | 31 | * @since 1.2 |
| 33 | 32 | */ |
| 34 | 33 | class PLL_Admin extends PLL_Admin_Base { |
| 35 | - /** | |
| 36 | - * Instance of PLL_Admin_Filters | |
| 37 | - * | |
| 38 | - * @var PLL_Admin_Filters | |
| 39 | - */ | |
| 40 | - public $filters; | |
| 34 | + public $filters, $filters_columns, $filters_post, $filters_term, $nav_menu, $filters_media; | |
| 41 | 35 | |
| 42 | 36 | /** |
| 43 | - * Instance of PLL_Admin_Filters_Columns | |
| 44 | - * | |
| 45 | - * @var PLL_Admin_Filters_Columns | |
| 46 | - */ | |
| 47 | - public $filters_columns; | |
| 48 | - | |
| 49 | - /** | |
| 50 | - * Instance of PLL_Admin_Filters_Post | |
| 51 | - * | |
| 52 | - * @var PLL_Admin_Filters_Post | |
| 53 | - */ | |
| 54 | - public $filters_post; | |
| 55 | - | |
| 56 | - /** | |
| 57 | - * Instance of PLL_Admin_filters_Term | |
| 58 | - * | |
| 59 | - * @var PLL_Admin_filters_Term | |
| 60 | - */ | |
| 61 | - public $filters_term; | |
| 62 | - | |
| 63 | - /** | |
| 64 | - * Instance of PLL_Admin_Nav_Menu | |
| 65 | - * | |
| 66 | - * @var PLL_Admin_Nav_Menu | |
| 67 | - */ | |
| 68 | - public $nav_menu; | |
| 69 | - | |
| 70 | - /** | |
| 71 | - * Instance of PLL_Admin_Filters_Media | |
| 72 | - * | |
| 73 | - * @var PLL_Admin_Filters_Media | |
| 74 | - */ | |
| 75 | - public $filters_media; | |
| 76 | - | |
| 77 | - /** | |
| 78 | - * Instance of PLL_Filters_Sanitization | |
| 79 | - * | |
| 80 | - * @since 2.9 | |
| 81 | - * | |
| 82 | - * @var PLL_Filters_Sanitization | |
| 83 | - */ | |
| 84 | - public $filters_sanitization; | |
| 85 | - | |
| 86 | - /** | |
| 87 | 37 | * Loads the polylang text domain |
| 88 | 38 | * Setups filters and action needed on all admin pages and on plugins page |
| 89 | 39 | * |
| 90 | 40 | * @since 1.2 |
| @@ -148,9 +98,8 @@ | ||
| 148 | 98 | * @since 1.2 |
| 149 | 99 | * @since 2.7 instantiate a PLL_Bulk_Translate instance. |
| 150 | 100 | */ |
| 151 | 101 | public function add_filters() { |
| 152 | - $this->filters_sanitization = new PLL_Filters_Sanitization( $this->get_locale_for_sanitization() ); | |
| 153 | 102 | // All these are separated just for convenience and maintainability |
| 154 | 103 | $classes = array( 'Filters', 'Filters_Columns', 'Filters_Post', 'Filters_Term', 'Nav_Menu', 'Classic_Editor', 'Block_Editor' ); |
| 155 | 104 | |
| 156 | 105 | // Don't load media filters if option is disabled or if user has no right |
| @@ -170,29 +119,6 @@ | ||
| 170 | 119 | */ |
| 171 | 120 | $class = apply_filters( 'pll_' . $obj, 'PLL_Admin_' . $class ); |
| 172 | 121 | $this->$obj = new $class( $this ); |
| 173 | 122 | } |
| 174 | - } | |
| 175 | - /** | |
| 176 | - * Retrieve the locale according to the current language instead of the language | |
| 177 | - * of the admin interface. | |
| 178 | - * | |
| 179 | - * @since 2.0 | |
| 180 | - * | |
| 181 | - * @return string | |
| 182 | - */ | |
| 183 | - public function get_locale_for_sanitization() { | |
| 184 | - $locale = get_locale(); | |
| 185 | - | |
| 186 | - if ( isset( $_POST['post_lang_choice'] ) && $lang = $this->model->get_language( sanitize_key( $_POST['post_lang_choice'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 187 | - $locale = $lang->locale; | |
| 188 | - } elseif ( isset( $_POST['term_lang_choice'] ) && $lang = $this->model->get_language( sanitize_key( $_POST['term_lang_choice'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 189 | - $locale = $lang->locale; | |
| 190 | - } elseif ( isset( $_POST['inline_lang_choice'] ) && $lang = $this->model->get_language( sanitize_key( $_POST['inline_lang_choice'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 191 | - $locale = $lang->locale; | |
| 192 | - } elseif ( ! empty( $this->curlang ) ) { | |
| 193 | - $locale = $this->curlang->locale; | |
| 194 | - } | |
| 195 | - | |
| 196 | - return $locale; | |
| 197 | 123 | } |
| 198 | 124 | } |
