Merge pull request #84 from lipemat/feature/is_main_query

Feature/is main query

Author: mboynes

class-es-wp-query-shoehorn.php

@@ -24,7 +24,7 @@ function es_wp_query_arg( $vars ) {
  * If a WP_Query object has `'es' => true`, use Elasticsearch to run the meat of the query.
  * This is fires on the "pre_get_posts" action.
  *
- * @param  object $query WP_Query object.
+ * @param  WP_Query $query - Current full WP_Query object.
  * @return void
  */
 function es_wp_query_shoehorn( &$query ) {
@@ -78,6 +78,7 @@ function es_wp_query_shoehorn( &$query ) {
 		 */
 		$es_query_args           = $query->query;
 		$es_query_args['fields'] = 'ids';
+		$es_query_args['es_is_main_query'] = $query->is_main_query();
 		$es_query                = new ES_WP_Query( $es_query_args );
 
 		// Make the post query use the post IDs from the ES results instead.
@@ -90,7 +91,7 @@ function es_wp_query_shoehorn( &$query ) {
 				'fields'         => $query->get( 'fields' ),
 				'orderby'        => 'post__in',
 				'order'          => 'ASC',
-			) 
+			)
 		);
 
 		// Reinsert all the conditionals from the original query.

class-es-wp-query-wrapper.php

@@ -34,6 +34,7 @@ abstract class ES_WP_Query_Wrapper extends WP_Query {
 	 */
 	public $es_response;
 
+
 	/**
 	 * Construct for querying Elasticsearch. Must be implemented in child classes.
 	 *
@@ -43,6 +44,19 @@ abstract class ES_WP_Query_Wrapper extends WP_Query {
 	 */
 	abstract protected function query_es( $es_args );
 
+	/**
+	 * Override default WP_Query->is_main_query() to support
+	 * this conditional when the main query has been overridden
+	 * by this class.
+	 *
+	 * @fixes #38
+	 *
+	 * @return bool
+	 */
+	public function is_main_query() {
+		return $this->get( 'es_is_main_query', false );
+	}
+
 	/**
 	 * Maps a field to its Elasticsearch context.
 	 *