Merge pull request #4 from Yoko-Co/pagination

Resolving merge errors

Author: konstantinbrazhnik

class-facetwp.php

@@ -214,21 +214,16 @@ private function register_root_field($config)
                  * facets array is the resolved payload for this field
                  * results & pager are returned so the connection resolver can use the data
                  */
-                return [
+				$return_vals = [
                     'facets'    => array_values($payload['facets']),
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    'results'   => count( $payload['results'] ) > 0 ? $payload['results'] : [-1],
-=======
-					// Return [-1] because an empty array will return all unfiltered results instead of none.
-                    'results'   => count( $results ) ? $results : [-1],
->>>>>>> 6c51f84 (Use GraphQL pagination filter)
-=======
-					// Return [-1] because an empty array will return all unfiltered results instead of none.
-                    'results'   => count( $results ) ? $results : [-1],
->>>>>>> 6c51f8450b26a5ee87eb76fb31631403fe8847bf
-					'pager'     => $payload['pager'],
+                    'results'   => count( $results ) ? $results : [-1]
                 ];
+
+				if ( ! self::$use_graphql_pagination ) {
+					$return_vals['pager'] = $payload['pager'];
+				}
+
+                return $return_vals;
             },
         ]);
     }
@@ -261,23 +256,10 @@ private function register_facet_connection($config)
 					$args['first'] = $source['pager']['per_page'];
 				}
                 $resolver = new PostObjectConnectionResolver($source, $args, $context, $info, $type);
-<<<<<<< HEAD
-<<<<<<< HEAD
-                return $resolver
-                    ->set_query_arg('post__in', $source['results'])
-					->set_query_arg('orderby', 'post__in')
-                    ->get_connection();
-=======
-=======
->>>>>>> 6c51f8450b26a5ee87eb76fb31631403fe8847bf
-
+				
 				return $resolver
 					->set_query_arg('post__in', $source['results'])
 					->get_connection();
-<<<<<<< HEAD
->>>>>>> 6c51f84 (Use GraphQL pagination filter)
-=======
->>>>>>> 6c51f8450b26a5ee87eb76fb31631403fe8847bf
             },
         ]);
     }