Merge pull request #931 from websharks/feature/877

PR: feature/877

.gitchange

@@ -1 +1 @@
-1460698120
+1460699757

s2member/includes/classes/sc-paypal-button-e.inc.php

@@ -46,7 +46,12 @@ public static function sc_paypal_button_encryption ($code = FALSE, $vars = FALSE
 						do_action("ws_plugin__s2member_before_sc_paypal_button_encryption", get_defined_vars ());
 						unset($__refs, $__v);
 
-						if ($GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["paypal_btn_encryption"] && $GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["paypal_business"] && $GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["paypal_api_username"])
+						if ($GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["paypal_btn_encryption"]
+							&& $GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["paypal_business"]
+							&& $GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["paypal_api_username"]
+							&& $GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["paypal_api_password"]
+							&& $GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["paypal_api_signature"]
+						) // Only if it is possible to connect to the PayPal API.
 							{
 								$cache = /* Are we caching? */ apply_filters("ws_plugin__s2member_sc_paypal_button_encryption_cache", true, get_defined_vars ());
 

s2member/includes/syscon.inc.php

@@ -225,7 +225,7 @@ function ws_plugin__s2member_configure_options_and_their_defaults($options = FAL
 		$default_options['paypal_api_password']   = '';
 		$default_options['paypal_api_signature']  = '';
 		$default_options['paypal_identity_token'] = '';
-		$default_options['paypal_btn_encryption'] = '0';
+		$default_options['paypal_btn_encryption'] = '1';
 
 		$default_options['paypal_payflow_api_username'] = '';
 		$default_options['paypal_payflow_api_partner']  = 'PayPal';