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

		@@ -1,8 +1,5 @@
1	1	<?php
2		-/**
3		- * @package Polylang
4		- */
5	2
6	3	/**
7	4	* A class to manipulate the language query var in WP_Query
8	5	*
		@@ -8,17 +5,31 @@
8	5	*
9	6	* @since 2.2
10	7	*/
11	8	class PLL_Query {
12		- /**
13		- * @var PLL_Model
14		- */
15		- public $model;
16	9
17		- /**
18		- * @var WP_Query
19		- */
20		- public $query;
	10	+ static protected $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	+ );
21	32
22	33	/**
23	34	* Constructor
24	35	*
		@@ -23,10 +34,10 @@
23	34	* Constructor
24	35	*
25	36	* @since 2.2
26	37	*
27		- * @param WP_Query $query Reference to the WP_Query object.
28		- * @param PLL_Model $model Instance of PLL_Model.
	38	+ * @param array $query Reference to the WP_Query object
	39	+ * @param object $model
29	40	*/
30	41	public function __construct( &$query, &$model ) {
31	42	$this->query = &$query;
32	43	$this->model = &$model;
		@@ -32,32 +43,8 @@
32	43	$this->model = &$model;
33	44	}
34	45
35	46	/**
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		- /**
60	47	* Check if translated taxonomy is queried
61	48	* Compatible with nested queries introduced in WP 4.1
62	49	*
63	50	* @see https://wordpress.org/support/topic/tax_query-bug
		@@ -95,15 +82,14 @@
95	82	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();
96	83	}
97	84
98	85	/**
99		- * Sets the language in query.
100		- * Optimized for (and requires) WP 3.5+.
	86	+ * Sets the language in query
	87	+ * Optimized for ( needs ) WP 3.5+
101	88	*
102	89	* @since 2.2
103	90	*
104		- * @param PLL_Language $lang Language object.
105		- * @return void
	91	+ * @param object $lang
106	92	*/
107	93	public function set_language( $lang ) {
108	94	// Defining directly the tax_query ( rather than setting 'lang' avoids transforming the query by WP )
109	95	$lang_query = array(
		@@ -132,24 +118,50 @@
132	118	}
133	119	}
134	120
135	121	/**
136		- * Adds the language in the query after it has checked that it won't conflict with other query vars.
	122	+ * Add the language in query after it has checked that it won't conflict with other query vars
137	123	*
138	124	* @since 2.2
139	125	*
140		- * @param PLL_Language $lang Language.
141		- * @return void
	126	+ * @param object $lang Language
142	127	*/
143	128	public function filter_query( $lang ) {
144	129	$qvars = &$this->query->query_vars;
145	130
146		- if ( ! $this->is_already_filtered( $qvars ) ) {
	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	+
147	159	$taxonomies = array_intersect( $this->model->get_translated_taxonomies(), get_taxonomies( array( '_builtin' => false ) ) );
148	160
149	161	foreach ( $taxonomies as $tax ) {
150		- $tax_object = get_taxonomy( $tax );
151		- if ( ! empty( $tax_object ) && ! empty( $qvars[ $tax_object->query_var ] ) ) {
	162	+ $tax = get_taxonomy( $tax );
	163	+ if ( ! empty( $qvars[ $tax->query_var ] ) ) {
152	164	return;
153	165	}
154	166	}
155	167
		@@ -163,9 +175,9 @@
163	175
164	176	if ( $taxonomies && ( empty( $qvars['post_type'] ) || 'any' === $qvars['post_type'] ) ) {
165	177	foreach ( $taxonomies as $taxonomy ) {
166	178	$tax_object = get_taxonomy( $taxonomy );
167		- if ( ! empty( $tax_object ) && $this->model->is_translated_post_type( $tax_object->object_type ) ) {
	179	+ if ( $this->model->is_translated_post_type( $tax_object->object_type ) ) {
168	180	$this->set_language( $lang );
169	181	break;
170	182	}
171	183	}