Merge pull request #74 from dparker1005/is_page-empty-check

Now checking that pages ar not empty before using is_page()
strangerstudios · Sep 22, 2021 · 1af1801 · 1af1801
2 parents e03c608 + 9cf9747
commit 1af1801
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/classes/class-swsales-reports.php b/classes/class-swsales-reports.php
@@ -255,8 +255,9 @@ public static function enqueue_tracking_js() {
 
 		wp_register_script( 'swsales_tracking', plugins_url( 'js/swsales-tracking.js', SWSALES_BASENAME ), array( 'jquery', 'utils' ) );
 
+		$landing_page_post_id = $active_sitewide_sale->get_landing_page_post_id();
 		$swsales_data = array(
-			'landing_page'      => is_page( $active_sitewide_sale->get_landing_page_post_id() ),
+			'landing_page'      => ! empty( $landing_page_post_id ) && is_page( $landing_page_post_id ),
 			'sitewide_sale_id'  => $active_sitewide_sale->get_id(),
 			'ajax_url'          => admin_url( 'admin-ajax.php' ),
 		);

diff --git a/modules/class-swsales-module-edd.php b/modules/class-swsales-module-edd.php
@@ -255,7 +255,7 @@ public static function is_checkout_page( $is_checkout_page, $sitewide_sale ) {
 			return $is_checkout_page;
 		}
 		$edd_checkout_pages = array( edd_get_option( 'purchase_page' ), edd_get_option( 'success_page' ), edd_get_option( 'failure_page' ) );
-		return is_page( $edd_checkout_pages ) ? true : $is_checkout_page;
+		return ( ! empty( $edd_checkout_pages ) && is_page( $edd_checkout_pages ) ) ? true : $is_checkout_page;
 	}
 
 	/**
@@ -318,7 +318,7 @@ public static function strike_prices( $price, $download_id ) {
 
 		// Check if we are on the landing page
 		$landing_page_post_id             = intval( $active_sitewide_sale->get_landing_page_post_id() );
-		$on_landing_page                  = is_page( $landing_page_post_id );
+		$on_landing_page                  = ! empty( $landing_page_post_id ) && is_page( $landing_page_post_id );
 		$should_apply_discount_on_landing = ( 'none' !== $active_sitewide_sale->get_automatic_discount() );
 
 		// If discount code will be applied or we are on the landing page, strike prices.

diff --git a/modules/class-swsales-module-pmpro.php b/modules/class-swsales-module-pmpro.php
@@ -687,7 +687,7 @@ public static function is_checkout_page( $is_checkout_page, $sitewide_sale ) {
 			return $is_checkout_page;
 		}
 		global $pmpro_pages;
-		return is_page( $pmpro_pages['checkout'] ) ? true : $is_checkout_page;
+		return ( ! empty( $pmpro_pages['checkout'] ) && is_page( $pmpro_pages['checkout'] ) ) ? true : $is_checkout_page;
 	}
 
 	/**

diff --git a/modules/class-swsales-module-wc.php b/modules/class-swsales-module-wc.php
@@ -249,7 +249,7 @@ public static function is_checkout_page( $is_checkout_page, $sitewide_sale ) {
 		if ( 'wc' !== $sitewide_sale->get_sale_type() ) {
 			return $is_checkout_page;
 		}
-		return is_page( wc_get_page_id( 'cart' ) ) ? true : $is_checkout_page;
+		return ( ! empty( wc_get_page_id( 'cart' ) ) && is_page( wc_get_page_id( 'cart' ) ) ) ? true : $is_checkout_page;
 	}
 
 	/**