← All changes | src/frontend/choose-lang-content.php +2 -2 3.8.9 → trunk View file →

		@@ -137,9 +137,9 @@
137	137	}
138	138
139	139	parent::parse_main_query( $query );
140	140
141		- $is_archive = ( count( $query->query ) == 1 && ! empty( $qv['paged'] ) ) ||
	141	+ $is_archive = ( count( (array) $query->query ) == 1 && ! empty( $qv['paged'] ) ) ||
142	142	$query->is_date ||
143	143	$query->is_author ||
144	144	( ! empty( $qv['post_type'] ) && $query->is_post_type_archive && $this->model->is_translated_post_type( $qv['post_type'] ) );
145	145
		@@ -145,9 +145,9 @@
145	145
146	146	// Sets the language in case we hide the default language
147	147	// Use $query->query['s'] as is_search is not set when search is empty
148	148	// http://wordpress.org/support/topic/search-for-empty-string-in-default-language
149		- if ( $this->options['hide_default'] && ! isset( $qv['lang'] ) && ( $is_archive || isset( $query->query['s'] ) || ( count( $query->query ) == 1 && ! empty( $qv['feed'] ) ) ) ) {
	149	+ if ( $this->options['hide_default'] && ! isset( $qv['lang'] ) && ( $is_archive || isset( $query->query['s'] ) || ( count( (array) $query->query ) == 1 && ! empty( $qv['feed'] ) ) ) ) {
150	150	$this->set_language( $this->model->get_default_language() );
151	151	$this->set_curlang_in_query( $query );
152	152	}
153	153	}