Merge pull request #466 from woocommerce/fix/fatal-error-spb

Fix issue by triggering code only on front-end

Author: laurendavissmith

changelog.txt

@@ -1,5 +1,8 @@
 *** Changelog ***
 
+= 1.6.3 - 2018-08-15 =
+* Fix - Fatal error caused by a fix for Smart Payment Buttons.
+
 = 1.6.2 - 2018-08-15 =
 * Fix - Tax not applied on the (Confirm your PayPal order) page at the checkout.
 

includes/class-wc-gateway-ppec-cart-handler.php

@@ -376,6 +376,12 @@ public function enqueue_scripts() {
 	 * Creates a customer session if one is not already active.
 	 */
 	public function ensure_session() {
+		$frontend = ( ! is_admin() || defined( 'DOING_AJAX' ) ) && ! defined( 'DOING_CRON' ) && ! defined( 'REST_REQUEST' );
+
+		if ( ! $frontend ) {
+			return;
+		}
+
 		if ( ! WC()->session->has_session() ) {
 			WC()->session->set_customer_session_cookie( true );
 		}

readme.txt

@@ -3,7 +3,7 @@ Contributors: automattic, woothemes, akeda, dwainm, royho, allendav, slash1andy,
 Tags: ecommerce, e-commerce, commerce, woothemes, wordpress ecommerce, store, sales, sell, shop, shopping, cart, checkout, configurable, paypal
 Requires at least: 4.4
 Tested up to: 4.9.6
-Stable tag: 1.6.2
+Stable tag: 1.6.3
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -101,6 +101,9 @@ Please use this to inform us about bugs, or make contributions via PRs.
 
 == Changelog ==
 
+= 1.6.3 - 2018-08-15 =
+* Fix - Fatal error caused by a fix for Smart Payment Buttons.
+
 = 1.6.2 - 2018-08-15 =
 * Fix - Tax not applied on the (Confirm your PayPal order) page at the checkout.
 

woocommerce-gateway-paypal-express-checkout.php

@@ -3,7 +3,7 @@
  * Plugin Name: WooCommerce PayPal Checkout Gateway
  * Plugin URI: https://woocommerce.com/products/woocommerce-gateway-paypal-express-checkout/
  * Description: A payment gateway for PayPal Checkout (https://www.paypal.com/us/webapps/mpp/paypal-checkout).
- * Version: 1.6.2
+ * Version: 1.6.3
  * Author: WooCommerce
  * Author URI: https://woocommerce.com
  * Copyright: © 2018 WooCommerce / PayPal.
@@ -27,7 +27,7 @@
 	exit; // Exit if accessed directly
 }
 
-define( 'WC_GATEWAY_PPEC_VERSION', '1.6.2' );
+define( 'WC_GATEWAY_PPEC_VERSION', '1.6.3' );
 
 /**
  * Return instance of WC_Gateway_PPEC_Plugin.