← All changes | include/query.php +47 -11 2.9 → 3.1.4 View file →

		@@ -9,14 +9,24 @@
9	9	* @since 2.2
10	10	*/
11	11	class PLL_Query {
12	12	/**
	13	+ * @var PLL_Model
	14	+ */
	15	+ public $model;
	16	+
	17	+ /**
	18	+ * @var WP_Query
	19	+ */
	20	+ public $query;
	21	+
	22	+ /**
13	23	* Constructor
14	24	*
15	25	* @since 2.2
16	26	*
17		- * @param array $query Reference to the WP_Query object
18		- * @param object $model
	27	+ * @param WP_Query $query Reference to the WP_Query object.
	28	+ * @param PLL_Model $model Instance of PLL_Model.
19	29	*/
20	30	public function __construct( &$query, &$model ) {
21	31	$this->query = &$query;
22	32	$this->model = &$model;
		@@ -22,8 +32,32 @@
22	32	$this->model = &$model;
23	33	}
24	34
25	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	+ /**
26	60	* Check if translated taxonomy is queried
27	61	* Compatible with nested queries introduced in WP 4.1
28	62	*
29	63	* @see https://wordpress.org/support/topic/tax_query-bug
		@@ -61,14 +95,15 @@
61	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();
62	96	}
63	97
64	98	/**
65		- * Sets the language in query
66		- * Optimized for ( needs ) WP 3.5+
	99	+ * Sets the language in query.
	100	+ * Optimized for (and requires) WP 3.5+.
67	101	*
68	102	* @since 2.2
69	103	*
70		- * @param object $lang
	104	+ * @param PLL_Language $lang Language object.
	105	+ * @return void
71	106	*/
72	107	public function set_language( $lang ) {
73	108	// Defining directly the tax_query ( rather than setting 'lang' avoids transforming the query by WP )
74	109	$lang_query = array(
		@@ -97,23 +132,24 @@
97	132	}
98	133	}
99	134
100	135	/**
101		- * 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.
102	137	*
103	138	* @since 2.2
104	139	*
105		- * @param object $lang Language
	140	+ * @param PLL_Language $lang Language.
	141	+ * @return void
106	142	*/
107	143	public function filter_query( $lang ) {
108	144	$qvars = &$this->query->query_vars;
109	145
110		- if ( ! isset( $qvars['lang'] ) ) {
	146	+ if ( ! $this->is_already_filtered( $qvars ) ) {
111	147	$taxonomies = array_intersect( $this->model->get_translated_taxonomies(), get_taxonomies( array( '_builtin' => false ) ) );
112	148
113	149	foreach ( $taxonomies as $tax ) {
114		- $tax = get_taxonomy( $tax );
115		- if ( ! empty( $qvars[ $tax->query_var ] ) ) {
	150	+ $tax_object = get_taxonomy( $tax );
	151	+ if ( ! empty( $tax_object ) && ! empty( $qvars[ $tax_object->query_var ] ) ) {
116	152	return;
117	153	}
118	154	}
119	155
		@@ -127,9 +163,9 @@
127	163
128	164	if ( $taxonomies && ( empty( $qvars['post_type'] ) || 'any' === $qvars['post_type'] ) ) {
129	165	foreach ( $taxonomies as $taxonomy ) {
130	166	$tax_object = get_taxonomy( $taxonomy );
131		- 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 ) ) {
132	168	$this->set_language( $lang );
133	169	break;
134	170	}
135	171	}