reset loop on loop_end

woocommerce · Jul 19, 2012 · a239922 · a239922
1 parent 4856636
commit a239922
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/classes/class-wc-query.php b/classes/class-wc-query.php
@@ -27,10 +27,7 @@ function __construct() {
 	 * Hook into pre_get_posts to do the main product query
 	 */
 	function pre_get_posts( $q ) {
-		global $woocommerce, $woocommerce_loop;
-
-		// Reset loop/columns globals when starting a new loop
-		$woocommerce_loop['loop'] = $woocommerce_loop['column'] = '';
+		global $woocommerce;
 
 		// We only want to affect the main query
 		if ( ! $q->is_main_query() )

diff --git a/readme.txt b/readme.txt
@@ -151,6 +151,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
 == Changelog ==
 
 = 1.6.2 - 19/07/2012 =
+* Tweak - woocommerce_reset_loop() on loop_end to reset columns and index
 * Fix - Product categories shortcode loop
 
 = 1.6.1 - 19/07/2012 =

diff --git a/woocommerce-hooks.php b/woocommerce-hooks.php
@@ -30,6 +30,7 @@
 	add_action( 'woocommerce_sidebar', 'woocommerce_get_sidebar', 10 );
 
 	/* Products Loop */
+	add_filter( 'loop_end', 'woocommerce_reset_loop' );
 	add_action( 'woocommerce_before_shop_loop', 'woocommerce_show_messages', 10 );
 	add_action( 'woocommerce_after_shop_loop_item', 'woocommerce_template_loop_add_to_cart', 10);
 	add_action( 'woocommerce_before_shop_loop_item_title', 'woocommerce_template_loop_product_thumbnail', 10);

diff --git a/woocommerce-template.php b/woocommerce-template.php
@@ -205,6 +205,13 @@ function woocommerce_show_product_loop_sale_flash() {
 		woocommerce_get_template( 'loop/sale-flash.php' );
 	}
 }
+if ( ! function_exists( 'woocommerce_reset_loop' ) ) {
+	function woocommerce_reset_loop() {
+		global $woocommerce_loop;
+		// Reset loop/columns globals when starting a new loop
+		$woocommerce_loop['loop'] = $woocommerce_loop['column'] = '';
+	}
+}
 
 /**
  * WooCommerce Product Thumbnail