Dyad 2: Fixes Jetpack Infinite Scroll WC issues.

dyad-2/inc/jetpack.php

@@ -28,7 +28,6 @@ if ( ! function_exists( 'dyad_2_jetpack' ) ) {
 			'footer_widgets' => array( 'sidebar-1'),
 			'render' => 'dyad_2_infinite_scroll_render',
 			'wrapper' => false,
-			'posts_per_page' => 12,
 		) );
 
 		//Content options

dyad-2/inc/woocommerce.php

@@ -115,7 +115,9 @@ add_filter( 'body_class', 'dyad_2_woocommerce_active_body_class' );
 function dyad_2_woocommerce_products_per_page() {
 	return 12;
 }
-add_filter( 'loop_shop_per_page', 'dyad_2_woocommerce_products_per_page' );
+if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
+	add_filter( 'loop_shop_per_page', 'dyad_2_woocommerce_products_per_page' );
+}
 
 /**
  * Product gallery thumnbail columns.
@@ -326,22 +328,6 @@ function dyad_2_woocommerce_is_shop_page() {
 	return $is_shop_page;
 }
 
-/**
- * Jetpack infinite scroll duplicates posts where orderby is anything other than modified or date
- * This filter offsets the products returned by however many are displayed per page
- *
- * @link https://github.com/Automattic/jetpack/issues/1135
- * @param  array $args infinite scroll args.
- * @return array       infinite scroll args.
- */
-function dyad_2_woocommerce_jetpack_duplicate_products( $args ) {
-	if ( ( isset( $args['post_type'] ) && 'product' === $args['post_type'] ) || ( isset( $args['taxonomy'] ) && 'product_cat' === $args['taxonomy'] ) ) {
-		$args['offset'] = $args['posts_per_page'] * $args['paged'];
-	}
- 	return $args;
-}
-add_filter( 'infinite_scroll_query_args', 'dyad_2_woocommerce_jetpack_duplicate_products', 100 );
-
 /**
  * Override number of products per page in Jetpack infinite scroll.
  *