Merge pull request woocommerce#1018 from woocommerce/fix/1016

Add missing WC functions file include
uok · Dec 11, 2018 · 66e2202 · 66e2202
2 parents e3d5d0c + 62e2eeb
commit 66e2202
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/functions.php b/functions.php
@@ -42,6 +42,7 @@
 
 	require 'inc/woocommerce/storefront-woocommerce-template-hooks.php';
 	require 'inc/woocommerce/storefront-woocommerce-template-functions.php';
+	require 'inc/woocommerce/storefront-woocommerce-functions.php';
 }
 
 if ( is_admin() ) {

diff --git a/inc/jetpack/class-storefront-jetpack.php b/inc/jetpack/class-storefront-jetpack.php
@@ -61,21 +61,21 @@ public function jetpack_setup() {
 		public function jetpack_infinite_scroll_loop() {
 			do_action( 'storefront_jetpack_infinite_scroll_before' );
 
-			if ( storefront_is_product_archive() ) {
+			if ( function_exists( 'storefront_is_product_archive' ) && storefront_is_product_archive() ) {
 				do_action( 'storefront_jetpack_product_infinite_scroll_before' );
 				woocommerce_product_loop_start();
 			}
 
 			while ( have_posts() ) :
 				the_post();
-				if ( storefront_is_product_archive() ) {
+				if ( function_exists( 'storefront_is_product_archive' ) && storefront_is_product_archive() ) {
 					wc_get_template_part( 'content', 'product' );
 				} else {
 					get_template_part( 'content', get_post_format() );
 				}
 			endwhile; // end of the loop.
 
-			if ( storefront_is_product_archive() ) {
+			if ( function_exists( 'storefront_is_product_archive' ) && storefront_is_product_archive() ) {
 				woocommerce_product_loop_end();
 				do_action( 'storefront_jetpack_product_infinite_scroll_after' );
 			}

diff --git a/inc/woocommerce/storefront-woocommerce-functions.php b/inc/woocommerce/storefront-woocommerce-functions.php
@@ -11,12 +11,8 @@
  * @return boolean
  */
 function storefront_is_product_archive() {
-	if ( storefront_is_woocommerce_activated() ) {
-		if ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) {
-			return true;
-		} else {
-			return false;
-		}
+	if ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) {
+		return true;
 	} else {
 		return false;
 	}