← All changes | include/base.php +56 -131 3.0.1 → 1.5 View file →

		@@ -1,170 +1,95 @@
1	1	<?php
2		-/**
3		- * @package Polylang
4		- */
5	2
6		-/**
7		- * Base class for both admin and frontend
	3	+/*
	4	+ * base class for both admin and frontend
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		- /**
20		- * @var PLL_Model
21		- */
22		- public $model;
23		-
24		- /**
25		- * Instance of a child class of PLL_Links_Model.
	11	+ /*
	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		- public function __construct( &$links_model ) {
	18	+ public function __construct(&$links_model) {
53	19	$this->links_model = &$links_model;
54	20	$this->model = &$links_model->model;
55	21	$this->options = &$this->model->options;
56	22
57		- $GLOBALS['l10n_unloaded']['pll_string'] = true; // Short-circuit _load_textdomain_just_in_time() for 'pll_string' domain in WP 4.6+
	23	+ add_action('widgets_init', array(&$this, 'widgets_init'));
58	24
59		- add_action( 'widgets_init', array( $this, 'widgets_init' ) );
60		-
61		- // User defined strings translations
62		- add_action( 'pll_language_defined', array( $this, 'load_strings_translations' ), 5 );
63		- 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		- // Switch_to_blog
67		- add_action( 'switch_blog', array( $this, 'switch_blog' ), 10, 2 );
	25	+ // user defined strings translations
	26	+ add_action('pll_language_defined', array(&$this, 'load_strings_translations'), 5);
68	27	}
69	28
70		- /**
71		- * Instantiates classes reacting to CRUD operations on posts and terms,
72		- * only when at least one language is defined.
	29	+ /*
	30	+ * registers our widgets
73	31	*
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		- * Registers our widgets
93		- *
94	32	* @since 0.1
95		- *
96		- * @return void
97	33	*/
98	34	public function widgets_init() {
99		- register_widget( 'PLL_Widget_Languages' );
	35	+ register_widget('PLL_Widget_Languages');
100	36
101		- // Overwrites the calendar widget to filter posts by language
102		- if ( ! defined( 'PLL_WIDGET_CALENDAR' ) || PLL_WIDGET_CALENDAR ) {
103		- unregister_widget( 'WP_Widget_Calendar' );
104		- register_widget( 'PLL_Widget_Calendar' );
	37	+ // overwrites the calendar widget to filter posts by language
	38	+ if (!defined('PLL_WIDGET_CALENDAR') || PLL_WIDGET_CALENDAR) {
	39	+ unregister_widget('WP_Widget_Calendar');
	40	+ register_widget('PLL_Widget_Calendar');
105	41	}
106		- }
107	42
108		- /**
109		- * Loads user defined strings translations
110		- *
111		- * @since 1.2
112		- * @since 2.1.3 $locale parameter added.
113		- *
114		- * @param string $locale Locale. Defaults to current locale.
115		- * @return void
116		- */
117		- public function load_strings_translations( $locale = '' ) {
118		- if ( empty( $locale ) ) {
119		- $locale = ( is_admin() && ! Polylang::is_ajax_on_front() ) ? get_user_locale() : get_locale();
120		- }
	43	+ // overwrites the recent posts and recent comments widget to use a language dependant cache key
	44	+ // useful only if using a cache plugin
	45	+ if (defined('WP_CACHE') && WP_CACHE) {
	46	+ if (!defined('PLL_WIDGET_RECENT_POSTS') || PLL_WIDGET_RECENT_POSTS) {
	47	+ unregister_widget('WP_Widget_Recent_Posts');
	48	+ register_widget('PLL_Widget_Recent_Posts');
	49	+ }
121	50
122		- $language = $this->model->get_language( $locale );
123		-
124		- if ( ! empty( $language ) ) {
125		- $mo = new PLL_MO();
126		- $mo->import_from_db( $language );
127		- $GLOBALS['l10n']['pll_string'] = &$mo;
128		- } else {
129		- unset( $GLOBALS['l10n']['pll_string'] );
	51	+ if (!defined('PLL_WIDGET_RECENT_COMMENTS') || PLL_WIDGET_RECENT_COMMENTS) {
	52	+ unregister_widget('WP_Widget_Recent_Comments');
	53	+ register_widget('PLL_Widget_Recent_Comments');
	54	+ }
130	55	}
131	56	}
132	57
133		- /**
134		- * Resets some variables when the blog is switched.
135		- * Applied only if Polylang is active on the new blog.
	58	+ /*
	59	+ * loads user defined strings translations
136	60	*
137		- * @since 1.5.1
138		- *
139		- * @param int $new_blog_id New blog ID.
140		- * @param int $prev_blog_id Previous blog ID.
141		- * @return void
	61	+ * @since 1.2
142	62	*/
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' ) );
147		- $this->links_model = $this->model->get_links_model();
148		- }
	63	+ public function load_strings_translations() {
	64	+ $mo = new PLL_MO();
	65	+ $mo->import_from_db($this->model->get_language(get_locale()));
	66	+ $GLOBALS['l10n']['pll_string'] = &$mo;
149	67	}
150	68
151		- /**
152		- * Checks if Polylang is active on the new blog when the blog is switched.
	69	+ /*
	70	+ * some backward compatibility with Polylang < 1.2
	71	+ * allows for example to call $polylang->get_languages_list() instead of $polylang->model->get_languages_list()
	72	+ * this works but should be slower than the direct call, thus an error is triggered in debug mode
153	73	*
154		- * @since 3.0
	74	+ * @since 1.2
155	75	*
156		- * @param int $new_blog_id New blog ID.
157		- * @param int $prev_blog_id Previous blog ID.
158		- * @return bool
	76	+ * @param string $func function name
	77	+ * @param array $args function arguments
159	78	*/
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() ) );
	79	+ public function __call($func, $args) {
	80	+ foreach ($this as $prop => &$obj)
	81	+ if (is_object($obj) && method_exists($obj, $func)) {
	82	+ if (WP_DEBUG) {
	83	+ $debug = debug_backtrace();
	84	+ trigger_error(sprintf(
	85	+ '%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 $polylang->%2$s->%1$s() instead.' . "\nError handler",
	86	+ $func, $prop, $debug[1]['file'], $debug[1]['line']
	87	+ ));
	88	+ }
	89	+ return call_user_func_array(array($obj, $func), $args);
	90	+ }
163	91
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' );
	92	+ $debug = debug_backtrace();
	93	+ trigger_error(sprintf('Call to undefined function $polylang->%1$s() in %2$s on line %3$s' . "\nError handler", $func, $debug[0]['file'], $debug[0]['line']), E_USER_ERROR);
169	94	}
170	95	}