← All changes | include/base.php +27 -97 2.9.1 → 2.0.12 View file →

		@@ -1,8 +1,5 @@
1	1	<?php
2		-/**
3		- * @package Polylang
4		- */
5	2
6	3	/**
7	4	* Base class for both admin and frontend
8	5	*
		@@ -8,44 +5,11 @@
8	5	*
9	6	* @since 1.2
10	7	*/
11	8	abstract class PLL_Base {
12		- /**
13		- * Stores the plugin options.
14		- *
15		- * @var array
16		- */
17		- public $options;
	9	+ public $links_model, $model, $options;
18	10
19	11	/**
20		- * Instance of PLL_Model.
21		- *
22		- * @var PLL_Model
23		- */
24		- public $model;
25		-
26		- /**
27		- * Instance of a child class of PLL_Links_Model.
28		- *
29		- * @var PLL_Links_Model
30		- */
31		- public $links_model;
32		-
33		- /**
34		- * Registers hooks on insert / update post related actions and filters.
35		- *
36		- * @var PLL_CRUD_Posts
37		- */
38		- public $posts;
39		-
40		- /**
41		- * Registers hooks on insert / update term related action and filters.
42		- *
43		- * @var PLL_CRUD_Terms
44		- */
45		- public $terms;
46		-
47		- /**
48	12	* Constructor
49	13	*
50	14	* @since 1.2
51	15	*
		@@ -61,9 +25,8 @@
61	25	add_action( 'widgets_init', array( $this, 'widgets_init' ) );
62	26
63	27	// User defined strings translations
64	28	add_action( 'pll_language_defined', array( $this, 'load_strings_translations' ), 5 );
65		- add_action( 'change_locale', array( $this, 'load_strings_translations' ) ); // Since WP 4.7
66	29
67	30	// Switch_to_blog
68	31	add_action( 'switch_blog', array( $this, 'switch_blog' ), 10, 2 );
69	32	}
		@@ -68,27 +31,8 @@
68	31	add_action( 'switch_blog', array( $this, 'switch_blog' ), 10, 2 );
69	32	}
70	33
71	34	/**
72		- * Instantiates classes reacting to CRUD operations on posts and terms,
73		- * only when at least one language is defined.
74		- *
75		- * @since 2.6
76		- */
77		- public function init() {
78		- if ( $this->model->get_languages_list() ) {
79		- $this->posts = new PLL_CRUD_Posts( $this );
80		- $this->terms = new PLL_CRUD_Terms( $this );
81		-
82		- // WordPress options.
83		- new PLL_Translate_Option( 'blogname', array(), array( 'context' => 'WorPress' ) );
84		- new PLL_Translate_Option( 'blogdescription', array(), array( 'context' => 'WorPress' ) );
85		- new PLL_Translate_Option( 'date_format', array(), array( 'context' => 'WorPress' ) );
86		- new PLL_Translate_Option( 'time_format', array(), array( 'context' => 'WorPress' ) );
87		- }
88		- }
89		-
90		- /**
91	35	* Registers our widgets
92	36	*
93	37	* @since 0.1
94	38	*/
		@@ -99,8 +43,23 @@
99	43	if ( ! defined( 'PLL_WIDGET_CALENDAR' ) || PLL_WIDGET_CALENDAR ) {
100	44	unregister_widget( 'WP_Widget_Calendar' );
101	45	register_widget( 'PLL_Widget_Calendar' );
102	46	}
	47	+
	48	+ // Backward compatibility with WP < 4.4
	49	+ // Overwrites the recent posts and recent comments widget to use a language dependant cache key
	50	+ // Useful only if using a cache plugin
	51	+ if ( version_compare( $GLOBALS['wp_version'], '4.4', '<' ) && defined( 'WP_CACHE' ) && WP_CACHE ) {
	52	+ if ( ! defined( 'PLL_WIDGET_RECENT_POSTS' ) || PLL_WIDGET_RECENT_POSTS ) {
	53	+ unregister_widget( 'WP_Widget_Recent_Posts' );
	54	+ register_widget( 'PLL_Widget_Recent_Posts' );
	55	+ }
	56	+
	57	+ if ( ! defined( 'PLL_WIDGET_RECENT_COMMENTS' ) || PLL_WIDGET_RECENT_COMMENTS ) {
	58	+ unregister_widget( 'WP_Widget_Recent_Comments' );
	59	+ register_widget( 'PLL_Widget_Recent_Comments' );
	60	+ }
	61	+ }
103	62	}
104	63
105	64	/**
106	65	* Loads user defined strings translations
		@@ -105,26 +64,13 @@
105	64	/**
106	65	* Loads user defined strings translations
107	66	*
108	67	* @since 1.2
109		- * @since 2.1.3 $locale parameter added.
110		- *
111		- * @param string $locale Locale. Defaults to current locale.
112	68	*/
113		- public function load_strings_translations( $locale = '' ) {
114		- if ( empty( $locale ) ) {
115		- $locale = get_locale();
116		- }
117		-
118		- $language = $this->model->get_language( $locale );
119		-
120		- if ( ! empty( $language ) ) {
121		- $mo = new PLL_MO();
122		- $mo->import_from_db( $language );
123		- $GLOBALS['l10n']['pll_string'] = &$mo;
124		- } else {
125		- unset( $GLOBALS['l10n']['pll_string'] );
126		- }
	69	+ public function load_strings_translations() {
	70	+ $mo = new PLL_MO();
	71	+ $mo->import_from_db( $this->model->get_language( get_locale() ) );
	72	+ $GLOBALS['l10n']['pll_string'] = &$mo;
127	73	}
128	74
129	75	/**
130	76	* Resets some variables when switching blog
		@@ -131,10 +77,8 @@
131	77	* Applies only if Polylang is active on the new blog
132	78	*
133	79	* @since 1.5.1
134	80	*
135		- * @param int $new_blog
136		- * @param int $old_blog
137	81	* @return bool not used by WP but by child class
138	82	*/
139	83	public function switch_blog( $new_blog, $old_blog ) {
140	84	$plugins = ( $sitewide_plugins = get_site_option( 'active_sitewide_plugins' ) ) && is_array( $sitewide_plugins ) ? array_keys( $sitewide_plugins ) : array();
		@@ -143,9 +87,8 @@
143	87	// 2nd test needed when Polylang is not networked activated
144	88	// 3rd test needed when Polylang is networked activated and a new site is created
145	89	if ( $new_blog != $old_blog && in_array( POLYLANG_BASENAME, $plugins ) && get_option( 'polylang' ) ) {
146	90	$this->options = get_option( 'polylang' ); // Needed for menus
147		- remove_action( 'pre_option_rewrite_rules', array( $this->links_model, 'prepare_rewrite_rules' ) );
148	91	$this->links_model = $this->model->get_links_model();
149	92	return true;
150	93	}
151	94	return false;
		@@ -164,32 +107,19 @@
164	107	public function __call( $func, $args ) {
165	108	foreach ( $this as $prop => &$obj ) {
166	109	if ( is_object( $obj ) && method_exists( $obj, $func ) ) {
167	110	if ( WP_DEBUG ) {
168		- $debug = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions
	111	+ $debug = debug_backtrace();
169	112	$i = 1 + empty( $debug[1]['line'] ); // The file and line are in $debug[2] if the function was called using call_user_func
170		- trigger_error( // phpcs:ignore WordPress.PHP.DevelopmentFunctions
171		- sprintf(
172		- '%1$s was called incorrectly in %3$s on line %4$s: the call to $polylang->%1$s() has been deprecated in Polylang 1.2, use PLL()->%2$s->%1$s() instead.' . "\nError handler",
173		- esc_html( $func ),
174		- esc_html( $prop ),
175		- esc_html( $debug[ $i ]['file'] ),
176		- absint( $debug[ $i ]['line'] )
177		- )
178		- );
	113	+ trigger_error( sprintf(
	114	+ '%1$s was called incorrectly in %3$s on line %4$s: the call to $polylang->%1$s() has been deprecated in Polylang 1.2, use PLL()->%2$s->%1$s() instead.' . "\nError handler",
	115	+ $func, $prop, $debug[ $i ]['file'], $debug[ $i ]['line']
	116	+ ) );
179	117	}
180	118	return call_user_func_array( array( $obj, $func ), $args );
181	119	}
182	120	}
183	121
184		- $debug = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions
185		- trigger_error( // phpcs:ignore WordPress.PHP.DevelopmentFunctions
186		- sprintf(
187		- 'Call to undefined function PLL()->%1$s() in %2$s on line %3$s' . "\nError handler",
188		- esc_html( $func ),
189		- esc_html( $debug[0]['file'] ),
190		- absint( $debug[0]['line'] )
191		- ),
192		- E_USER_ERROR
193		- );
	122	+ $debug = debug_backtrace();
	123	+ trigger_error( sprintf( 'Call to undefined function PLL()->%1$s() in %2$s on line %3$s' . "\nError handler", $func, $debug[0]['file'], $debug[0]['line'] ), E_USER_ERROR );
194	124	}
195	125	}