← All changes | admin/admin.php +14 -14 3.0.3 → 3.6.7 View file →

		@@ -9,29 +9,29 @@
9	9	* @since 1.2
10	10	*/
11	11	class PLL_Admin extends PLL_Admin_Base {
12	12	/**
13		- * @var PLL_Admin_Filters
	13	+ * @var PLL_Admin_Filters|null
14	14	*/
15	15	public $filters;
16	16
17	17	/**
18		- * @var PLL_Admin_Filters_Columns
	18	+ * @var PLL_Admin_Filters_Columns|null
19	19	*/
20	20	public $filters_columns;
21	21
22	22	/**
23		- * @var PLL_Admin_Filters_Post
	23	+ * @var PLL_Admin_Filters_Post|null
24	24	*/
25	25	public $filters_post;
26	26
27	27	/**
28		- * @var PLL_Admin_Filters_Term
	28	+ * @var PLL_Admin_Filters_Term|null
29	29	*/
30	30	public $filters_term;
31	31
32	32	/**
33		- * @var PLL_Admin_Filters_Media
	33	+ * @var PLL_Admin_Filters_Media|null
34	34	*/
35	35	public $filters_media;
36	36
37	37	/**
		@@ -36,31 +36,31 @@
36	36
37	37	/**
38	38	* @since 2.9
39	39	*
40		- * @var PLL_Filters_Sanitization
	40	+ * @var PLL_Filters_Sanitization|null
41	41	*/
42	42	public $filters_sanitization;
43	43
44	44	/**
45		- * @var PLL_Admin_Block_Editor
	45	+ * @var PLL_Admin_Block_Editor|null
46	46	*/
47	47	public $block_editor;
48	48
49	49	/**
50		- * @var PLL_Admin_Classic_Editor
	50	+ * @var PLL_Admin_Classic_Editor|null
51	51	*/
52	52	public $classic_editor;
53	53
54	54	/**
55		- * @var PLL_Admin_Nav_Menu
	55	+ * @var PLL_Admin_Nav_Menu|null
56	56	*/
57	57	public $nav_menu;
58	58
59	59	/**
60		- * @var PLL_Admin_Filters_Widgets_Options
	60	+ * @var PLL_Admin_Filters_Widgets_Options|null
61	61	*/
62		- public $filters_widgets;
	62	+ public $filters_widgets_options;
63	63
64	64	/**
65	65	* Setups filters and action needed on all admin pages and on plugins page.
66	66	*
		@@ -86,9 +86,9 @@
86	86	parent::init();
87	87
88	88	// Setup filters for admin pages
89	89	// Priority 5 to make sure filters are there before customize_register is fired
90		- if ( $this->model->get_languages_list() ) {
	90	+ if ( $this->model->has_languages() ) {
91	91	add_action( 'wp_loaded', array( $this, 'add_filters' ), 5 );
92	92	}
93	93	}
94	94
		@@ -114,9 +114,9 @@
114	114	* @param object $r Plugin update data
115	115	* @return void
116	116	*/
117	117	public function plugin_update_message( $plugin_data, $r ) {
118		- if ( isset( $r->upgrade_notice ) ) {
	118	+ if ( ! empty( $r->upgrade_notice ) ) {
119	119	printf( '<p style="margin: 3px 0 0 0; border-top: 1px solid #ddd; padding-top: 3px">%s</p>', esc_html( $r->upgrade_notice ) );
120	120	}
121	121	}
122	122
		@@ -128,9 +128,9 @@
128	128	* @return void
129	129	*/
130	130	public function add_filters() {
131	131	$this->filters_sanitization = new PLL_Filters_Sanitization( $this->get_locale_for_sanitization() );
132		- $this->filters_widgets = new PLL_Admin_Filters_Widgets_Options( $this );
	132	+ $this->filters_widgets_options = new PLL_Admin_Filters_Widgets_Options( $this );
133	133
134	134	// All these are separated just for convenience and maintainability
135	135	$classes = array( 'Filters', 'Filters_Columns', 'Filters_Post', 'Filters_Term', 'Nav_Menu', 'Classic_Editor', 'Block_Editor' );
136	136