← All changes | include/query.php +48 -60 2.7 → 3.1 View file →

		@@ -1,5 +1,8 @@
1	1	<?php
	2	+/**
	3	+ * @package Polylang
	4	+ */
2	5
3	6	/**
4	7	* A class to manipulate the language query var in WP_Query
5	8	*
		@@ -5,31 +8,17 @@
5	8	*
6	9	* @since 2.2
7	10	*/
8	11	class PLL_Query {
	12	+ /**
	13	+ * @var PLL_Model
	14	+ */
	15	+ public $model;
9	16
10		- protected static $excludes = array(
11		- 'p',
12		- 'post_parent',
13		- 'attachment',
14		- 'attachment_id',
15		- 'name',
16		- 'pagename',
17		- 'page_id',
18		- 'category_name',
19		- 'tag',
20		- 'tag_id',
21		- 'cat',
22		- 'category__in',
23		- 'category__and',
24		- 'post__in',
25		- 'post_name__in',
26		- 'tag__in',
27		- 'tag__and',
28		- 'tag_slug__in',
29		- 'tag_slug__and',
30		- 'post_parent__in',
31		- );
	17	+ /**
	18	+ * @var WP_Query
	19	+ */
	20	+ public $query;
32	21
33	22	/**
34	23	* Constructor
35	24	*
		@@ -34,10 +23,10 @@
34	23	* Constructor
35	24	*
36	25	* @since 2.2
37	26	*
38		- * @param array $query Reference to the WP_Query object
39		- * @param object $model
	27	+ * @param WP_Query $query Reference to the WP_Query object.
	28	+ * @param PLL_Model $model Instance of PLL_Model.
40	29	*/
41	30	public function __construct( &$query, &$model ) {
42	31	$this->query = &$query;
43	32	$this->model = &$model;
		@@ -43,8 +32,32 @@
43	32	$this->model = &$model;
44	33	}
45	34
46	35	/**
	36	+ * Checks if the query already includes a language taxonomy.
	37	+ *
	38	+ * @since 3.0
	39	+ *
	40	+ * @param array $qvars WP_Query query vars.
	41	+ * @return bool
	42	+ */
	43	+ protected function is_already_filtered( $qvars ) {
	44	+ if ( isset( $qvars['lang'] ) ) {
	45	+ return true;
	46	+ }
	47	+
	48	+ if ( ! empty( $qvars['tax_query'] ) && is_array( $qvars['tax_query'] ) ) {
	49	+ foreach ( $qvars['tax_query'] as $tax_query ) {
	50	+ if ( isset( $tax_query['taxonomy'] ) && 'language' === $tax_query['taxonomy'] ) {
	51	+ return true;
	52	+ }
	53	+ }
	54	+ }
	55	+
	56	+ return false;
	57	+ }
	58	+
	59	+ /**
47	60	* Check if translated taxonomy is queried
48	61	* Compatible with nested queries introduced in WP 4.1
49	62	*
50	63	* @see https://wordpress.org/support/topic/tax_query-bug
		@@ -82,14 +95,15 @@
82	95	return isset( $this->query->tax_query->queried_terms ) ? array_keys( wp_list_filter( $this->query->tax_query->queried_terms, array( 'operator' => 'NOT IN' ), 'NOT' ) ) : array();
83	96	}
84	97
85	98	/**
86		- * Sets the language in query
87		- * Optimized for ( needs ) WP 3.5+
	99	+ * Sets the language in query.
	100	+ * Optimized for (and requires) WP 3.5+.
88	101	*
89	102	* @since 2.2
90	103	*
91		- * @param object $lang
	104	+ * @param PLL_Language $lang Language object.
	105	+ * @return void
92	106	*/
93	107	public function set_language( $lang ) {
94	108	// Defining directly the tax_query ( rather than setting 'lang' avoids transforming the query by WP )
95	109	$lang_query = array(
		@@ -118,50 +132,24 @@
118	132	}
119	133	}
120	134
121	135	/**
122		- * Add the language in query after it has checked that it won't conflict with other query vars
	136	+ * Adds the language in the query after it has checked that it won't conflict with other query vars.
123	137	*
124	138	* @since 2.2
125	139	*
126		- * @param object $lang Language
	140	+ * @param PLL_Language $lang Language.
	141	+ * @return void
127	142	*/
128	143	public function filter_query( $lang ) {
129	144	$qvars = &$this->query->query_vars;
130	145
131		- if ( ! isset( $qvars['lang'] ) ) {
132		- /**
133		- * Filter the query vars which disable the language filter in a query
134		- *
135		- * @since 2.3.5
136		- *
137		- * @param array $excludes Query vars excluded from the language filter
138		- * @param object $query WP Query
139		- * @param object $lang Language
140		- */
141		- $excludes = apply_filters( 'pll_filter_query_excluded_query_vars', self::$excludes, $this->query, $lang );
142		-
143		- // Do not filter the query if the language is already specified in another way
144		- foreach ( $excludes as $k ) {
145		- if ( ! empty( $qvars[ $k ] ) ) {
146		- // Specific case for 'cat' as it can contain negative values
147		- if ( 'cat' === $k ) {
148		- foreach ( explode( ',', $qvars['cat'] ) as $cat ) {
149		- if ( $cat > 0 ) {
150		- return;
151		- }
152		- }
153		- } else {
154		- return;
155		- }
156		- }
157		- }
158		-
	146	+ if ( ! $this->is_already_filtered( $qvars ) ) {
159	147	$taxonomies = array_intersect( $this->model->get_translated_taxonomies(), get_taxonomies( array( '_builtin' => false ) ) );
160	148
161	149	foreach ( $taxonomies as $tax ) {
162		- $tax = get_taxonomy( $tax );
163		- if ( ! empty( $qvars[ $tax->query_var ] ) ) {
	150	+ $tax_object = get_taxonomy( $tax );
	151	+ if ( ! empty( $tax_object ) && ! empty( $qvars[ $tax_object->query_var ] ) ) {
164	152	return;
165	153	}
166	154	}
167	155
		@@ -175,9 +163,9 @@
175	163
176	164	if ( $taxonomies && ( empty( $qvars['post_type'] ) || 'any' === $qvars['post_type'] ) ) {
177	165	foreach ( $taxonomies as $taxonomy ) {
178	166	$tax_object = get_taxonomy( $taxonomy );
179		- if ( $this->model->is_translated_post_type( $tax_object->object_type ) ) {
	167	+ if ( ! empty( $tax_object ) && $this->model->is_translated_post_type( $tax_object->object_type ) ) {
180	168	$this->set_language( $lang );
181	169	break;
182	170	}
183	171	}