← All changes | include/base.php +59 -34 3.0 → 2.9 View file →

		@@ -16,8 +16,10 @@
16	16	*/
17	17	public $options;
18	18
19	19	/**
	20	+ * Instance of PLL_Model.
	21	+ *
20	22	* @var PLL_Model
21	23	*/
22	24	public $model;
23	25
		@@ -42,13 +44,13 @@
42	44	*/
43	45	public $terms;
44	46
45	47	/**
46		- * Constructor.
	48	+ * Constructor
47	49	*
48	50	* @since 1.2
49	51	*
50		- * @param PLL_Links_Model $links_model Links Model.
	52	+ * @param object $links_model
51	53	*/
52	54	public function __construct( &$links_model ) {
53	55	$this->links_model = &$links_model;
54	56	$this->model = &$links_model->model;
		@@ -60,9 +62,8 @@
60	62
61	63	// User defined strings translations
62	64	add_action( 'pll_language_defined', array( $this, 'load_strings_translations' ), 5 );
63	65	add_action( 'change_locale', array( $this, 'load_strings_translations' ) ); // Since WP 4.7
64		- add_action( 'personal_options_update', array( $this, 'load_strings_translations' ), 1, 0 ); // Before WP, for confirmation request when changing the user email.
65	66
66	67	// Switch_to_blog
67	68	add_action( 'switch_blog', array( $this, 'switch_blog' ), 10, 2 );
68	69	}
		@@ -71,10 +72,8 @@
71	72	* Instantiates classes reacting to CRUD operations on posts and terms,
72	73	* only when at least one language is defined.
73	74	*
74	75	* @since 2.6
75		- *
76		- * @return void
77	76	*/
78	77	public function init() {
79	78	if ( $this->model->get_languages_list() ) {
80	79	$this->posts = new PLL_CRUD_Posts( $this );
		@@ -80,12 +79,12 @@
80	79	$this->posts = new PLL_CRUD_Posts( $this );
81	80	$this->terms = new PLL_CRUD_Terms( $this );
82	81
83	82	// WordPress options.
84		- new PLL_Translate_Option( 'blogname', array(), array( 'context' => 'WordPress' ) );
85		- new PLL_Translate_Option( 'blogdescription', array(), array( 'context' => 'WordPress' ) );
86		- new PLL_Translate_Option( 'date_format', array(), array( 'context' => 'WordPress' ) );
87		- new PLL_Translate_Option( 'time_format', array(), array( 'context' => 'WordPress' ) );
	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' ) );
88	87	}
89	88	}
90	89
91	90	/**
		@@ -91,10 +90,8 @@
91	90	/**
92	91	* Registers our widgets
93	92	*
94	93	* @since 0.1
95		- *
96		- * @return void
97	94	*/
98	95	public function widgets_init() {
99	96	register_widget( 'PLL_Widget_Languages' );
100	97
		@@ -111,13 +108,12 @@
111	108	* @since 1.2
112	109	* @since 2.1.3 $locale parameter added.
113	110	*
114	111	* @param string $locale Locale. Defaults to current locale.
115		- * @return void
116	112	*/
117	113	public function load_strings_translations( $locale = '' ) {
118	114	if ( empty( $locale ) ) {
119		- $locale = ( is_admin() && ! Polylang::is_ajax_on_front() ) ? get_user_locale() : get_locale();
	115	+ $locale = get_locale();
120	116	}
121	117
122	118	$language = $this->model->get_language( $locale );
123	119
		@@ -130,41 +126,70 @@
130	126	}
131	127	}
132	128
133	129	/**
134		- * Resets some variables when the blog is switched.
135		- * Applied only if Polylang is active on the new blog.
	130	+ * Resets some variables when switching blog
	131	+ * Applies only if Polylang is active on the new blog
136	132	*
137	133	* @since 1.5.1
138	134	*
139		- * @param int $new_blog_id New blog ID.
140		- * @param int $prev_blog_id Previous blog ID.
141		- * @return void
	135	+ * @param int $new_blog
	136	+ * @param int $old_blog
	137	+ * @return bool not used by WP but by child class
142	138	*/
143		- public function switch_blog( $new_blog_id, $prev_blog_id ) {
144		- if ( $this->is_active_on_new_blog( $new_blog_id, $prev_blog_id ) ) {
145		- $this->options = get_option( 'polylang' ); // Needed for menus.
	139	+ public function switch_blog( $new_blog, $old_blog ) {
	140	+ $plugins = ( $sitewide_plugins = get_site_option( 'active_sitewide_plugins' ) ) && is_array( $sitewide_plugins ) ? array_keys( $sitewide_plugins ) : array();
	141	+ $plugins = array_merge( $plugins, get_option( 'active_plugins', array() ) );
	142	+
	143	+ // 2nd test needed when Polylang is not networked activated
	144	+ // 3rd test needed when Polylang is networked activated and a new site is created
	145	+ if ( $new_blog != $old_blog && in_array( POLYLANG_BASENAME, $plugins ) && get_option( 'polylang' ) ) {
	146	+ $this->options = get_option( 'polylang' ); // Needed for menus
146	147	remove_action( 'pre_option_rewrite_rules', array( $this->links_model, 'prepare_rewrite_rules' ) );
147	148	$this->links_model = $this->model->get_links_model();
	149	+ return true;
148	150	}
	151	+ return false;
149	152	}
150	153
151	154	/**
152		- * Checks if Polylang is active on the new blog when the blog is switched.
	155	+ * Some backward compatibility with Polylang < 1.2
	156	+ * Allows for example to call $polylang->get_languages_list() instead of $polylang->model->get_languages_list()
	157	+ * This works but should be slower than the direct call, thus an error is triggered in debug mode
153	158	*
154		- * @since 3.0
	159	+ * @since 1.2
155	160	*
156		- * @param int $new_blog_id New blog ID.
157		- * @param int $prev_blog_id Previous blog ID.
158		- * @return bool
	161	+ * @param string $func function name
	162	+ * @param array $args function arguments
159	163	*/
160		- protected function is_active_on_new_blog( $new_blog_id, $prev_blog_id ) {
161		- $plugins = ( $sitewide_plugins = get_site_option( 'active_sitewide_plugins' ) ) && is_array( $sitewide_plugins ) ? array_keys( $sitewide_plugins ) : array();
162		- $plugins = array_merge( $plugins, get_option( 'active_plugins', array() ) );
	164	+ public function __call( $func, $args ) {
	165	+ foreach ( $this as $prop => &$obj ) {
	166	+ if ( is_object( $obj ) && method_exists( $obj, $func ) ) {
	167	+ if ( WP_DEBUG ) {
	168	+ $debug = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions
	169	+ $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	+ );
	179	+ }
	180	+ return call_user_func_array( array( $obj, $func ), $args );
	181	+ }
	182	+ }
163	183
164		- /*
165		- * The 2nd test is needed when Polylang is not networked activated.
166		- * The 3rd test is needed when Polylang is networked activated and a new site is created.
167		- */
168		- return $new_blog_id !== $prev_blog_id && in_array( POLYLANG_BASENAME, $plugins ) && get_option( 'polylang' );
	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	+ );
169	194	}
170	195	}