From a3c18696e899713989b18891fd88ce6812659d15 Mon Sep 17 00:00:00 2001 From: Mike Jolley Date: Tue, 22 May 2018 11:19:39 +0100 Subject: [PATCH] Fix terms display in preview --- includes/wc-template-functions.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/includes/wc-template-functions.php b/includes/wc-template-functions.php index 461413636ba..da377892372 100644 --- a/includes/wc-template-functions.php +++ b/includes/wc-template-functions.php @@ -22,7 +22,7 @@ function wc_template_redirect() { wp_safe_redirect( get_post_type_archive_link( 'product' ) ); exit; - } elseif ( is_page( wc_get_page_id( 'checkout' ) ) && wc_get_page_id( 'checkout' ) !== wc_get_page_id( 'cart' ) && WC()->cart->is_empty() && empty( $wp->query_vars['order-pay'] ) && ! isset( $wp->query_vars['order-received'] ) ) { + } elseif ( is_page( wc_get_page_id( 'checkout' ) ) && wc_get_page_id( 'checkout' ) !== wc_get_page_id( 'cart' ) && WC()->cart->is_empty() && empty( $wp->query_vars['order-pay'] ) && ! isset( $wp->query_vars['order-received'] ) && ! is_customize_preview() ) { // When on the checkout with an empty cart, redirect to cart page. wc_add_notice( __( 'Checkout is not available whilst your cart is empty.', 'woocommerce' ), 'notice' ); @@ -717,7 +717,8 @@ function wc_privacy_policy_page_id() { * @return bool */ function wc_terms_and_conditions_checkbox_enabled() { - $page = get_post( wc_terms_and_conditions_page_id() ); + $page_id = wc_terms_and_conditions_page_id(); + $page = $page_id ? get_post( $page_id ) : false; return $page && wc_get_terms_and_conditions_checkbox_text(); }