Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19477 from woocommerce/fix/infinite-scroll 

Infinite scroll compatibility
This commit is contained in:
Mike Jolley 2018-04-05 10:46:44 +01:00 committed by GitHub
parent 086f07c47d a826d4d91f
commit 5172694a3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
includes/class-wc-query.php
View File

@ -44,8 +44,7 @@ class WC_Query {
add_filter( 'query_vars', array( $this, 'add_query_vars' ), 0 );
add_action( 'parse_request', array( $this, 'parse_request' ), 0 );
add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ) );
add_action( 'wp', array( $this, 'remove_product_query' ) );
add_action( 'wp', array( $this, 'remove_ordering_args' ) );
add_filter( 'the_posts', array( $this, 'remove_product_query_filters' ) );
add_filter( 'get_pagenum_link', array( $this, 'remove_add_to_cart_pagination' ), 10, 1 );
}
$this->init_query_vars();
@ -340,9 +339,20 @@ class WC_Query {
}
$this->product_query( $q );
}
// And remove the pre_get_posts hook.
$this->remove_product_query();
/**
* Pre_get_posts above may adjust the main query to add WooCommerce logic. When this query is done, we need to ensure
* all custom filters are removed.
*
* This is done here during the_posts filter. The input is not changed.
*
* @param array $posts Posts from WP Query.
* @return array
*/
public function remove_product_query_filters( $posts ) {
$this->remove_ordering_args();
return $posts;
}
/**
@ -433,7 +443,7 @@ class WC_Query {
if ( is_search() ) {
$orderby_value = 'relevance';
} else {
$orderby_value = apply_filters( 'woocommerce_default_catalog_orderby', get_option( 'woocommerce_default_catalog_orderby' ) );
$orderby_value = apply_filters( 'woocommerce_default_catalog_orderby', get_option( 'woocommerce_default_catalog_orderby', 'menu_order' ) );
}
}