← All changes | include/base.php +41 -85 3.0 → 2.3 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,47 +5,16 @@
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		- * @var PLL_Model
21		- */
22		- public $model;
23		-
24		- /**
25		- * Instance of a child class of PLL_Links_Model.
	12	+ * Constructor
26	13	*
27		- * @var PLL_Links_Model
28		- */
29		- public $links_model;
30		-
31		- /**
32		- * Registers hooks on insert / update post related actions and filters.
33		- *
34		- * @var PLL_CRUD_Posts
35		- */
36		- public $posts;
37		-
38		- /**
39		- * Registers hooks on insert / update term related action and filters.
40		- *
41		- * @var PLL_CRUD_Terms
42		- */
43		- public $terms;
44		-
45		- /**
46		- * Constructor.
47		- *
48	14	* @since 1.2
49	15	*
50		- * @param PLL_Links_Model $links_model Links Model.
	16	+ * @param object $links_model
51	17	*/
52	18	public function __construct( &$links_model ) {
53	19	$this->links_model = &$links_model;
54	20	$this->model = &$links_model->model;
		@@ -60,9 +26,8 @@
60	26
61	27	// User defined strings translations
62	28	add_action( 'pll_language_defined', array( $this, 'load_strings_translations' ), 5 );
63	29	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	30
66	31	// Switch_to_blog
67	32	add_action( 'switch_blog', array( $this, 'switch_blog' ), 10, 2 );
68	33	}
		@@ -67,34 +32,11 @@
67	32	add_action( 'switch_blog', array( $this, 'switch_blog' ), 10, 2 );
68	33	}
69	34
70	35	/**
71		- * Instantiates classes reacting to CRUD operations on posts and terms,
72		- * only when at least one language is defined.
73		- *
74		- * @since 2.6
75		- *
76		- * @return void
77		- */
78		- public function init() {
79		- if ( $this->model->get_languages_list() ) {
80		- $this->posts = new PLL_CRUD_Posts( $this );
81		- $this->terms = new PLL_CRUD_Terms( $this );
82		-
83		- // 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' ) );
88		- }
89		- }
90		-
91		- /**
92	36	* Registers our widgets
93	37	*
94	38	* @since 0.1
95		- *
96		- * @return void
97	39	*/
98	40	public function widgets_init() {
99	41	register_widget( 'PLL_Widget_Languages' );
100	42
		@@ -111,13 +53,12 @@
111	53	* @since 1.2
112	54	* @since 2.1.3 $locale parameter added.
113	55	*
114	56	* @param string $locale Locale. Defaults to current locale.
115		- * @return void
116	57	*/
117	58	public function load_strings_translations( $locale = '' ) {
118	59	if ( empty( $locale ) ) {
119		- $locale = ( is_admin() && ! Polylang::is_ajax_on_front() ) ? get_user_locale() : get_locale();
	60	+ $locale = get_locale();
120	61	}
121	62
122	63	$language = $this->model->get_language( $locale );
123	64
		@@ -130,41 +71,56 @@
130	71	}
131	72	}
132	73
133	74	/**
134		- * Resets some variables when the blog is switched.
135		- * Applied only if Polylang is active on the new blog.
	75	+ * Resets some variables when switching blog
	76	+ * Applies only if Polylang is active on the new blog
136	77	*
137	78	* @since 1.5.1
138	79	*
139		- * @param int $new_blog_id New blog ID.
140		- * @param int $prev_blog_id Previous blog ID.
141		- * @return void
	80	+ * @param int $new_blog
	81	+ * @param int $old_blog
	82	+ * @return bool not used by WP but by child class
142	83	*/
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.
146		- remove_action( 'pre_option_rewrite_rules', array( $this->links_model, 'prepare_rewrite_rules' ) );
	84	+ public function switch_blog( $new_blog, $old_blog ) {
	85	+ $plugins = ( $sitewide_plugins = get_site_option( 'active_sitewide_plugins' ) ) && is_array( $sitewide_plugins ) ? array_keys( $sitewide_plugins ) : array();
	86	+ $plugins = array_merge( $plugins, get_option( 'active_plugins', array() ) );
	87	+
	88	+ // 2nd test needed when Polylang is not networked activated
	89	+ // 3rd test needed when Polylang is networked activated and a new site is created
	90	+ if ( $new_blog != $old_blog && in_array( POLYLANG_BASENAME, $plugins ) && get_option( 'polylang' ) ) {
	91	+ $this->options = get_option( 'polylang' ); // Needed for menus
147	92	$this->links_model = $this->model->get_links_model();
	93	+ return true;
148	94	}
	95	+ return false;
149	96	}
150	97
151	98	/**
152		- * Checks if Polylang is active on the new blog when the blog is switched.
	99	+ * Some backward compatibility with Polylang < 1.2
	100	+ * Allows for example to call $polylang->get_languages_list() instead of $polylang->model->get_languages_list()
	101	+ * This works but should be slower than the direct call, thus an error is triggered in debug mode
153	102	*
154		- * @since 3.0
	103	+ * @since 1.2
155	104	*
156		- * @param int $new_blog_id New blog ID.
157		- * @param int $prev_blog_id Previous blog ID.
158		- * @return bool
	105	+ * @param string $func function name
	106	+ * @param array $args function arguments
159	107	*/
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() ) );
	108	+ public function __call( $func, $args ) {
	109	+ foreach ( $this as $prop => &$obj ) {
	110	+ if ( is_object( $obj ) && method_exists( $obj, $func ) ) {
	111	+ if ( WP_DEBUG ) {
	112	+ $debug = debug_backtrace();
	113	+ $i = 1 + empty( $debug[1]['line'] ); // The file and line are in $debug[2] if the function was called using call_user_func
	114	+ trigger_error( sprintf(
	115	+ '%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",
	116	+ $func, $prop, $debug[ $i ]['file'], $debug[ $i ]['line']
	117	+ ) );
	118	+ }
	119	+ return call_user_func_array( array( $obj, $func ), $args );
	120	+ }
	121	+ }
163	122
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' );
	123	+ $debug = debug_backtrace();
	124	+ 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 );
169	125	}
170	126	}