Merge pull request #88 from dparker1005/prefix-level-fix

No longer pulling level from $_REQUEST
strangerstudios · Aug 11, 2023 · 346ddf1 · 346ddf1
2 parents 4a112a8 + 8f686eb
commit 346ddf1
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/pmpro-pay-by-check.php b/pmpro-pay-by-check.php
@@ -279,16 +279,11 @@ function pmpropbc_pmpro_valid_gateways($gateways)
 */
 function pmpropbc_pmpro_get_gateway($gateway)
 {
-	global $pmpro_level;
+	$level = pmpro_getLevelAtCheckout();
 
-	if(!empty($pmpro_level) || !empty($_REQUEST['level']))
+	if ( ! empty( $level->id ) )
 	{
-		if(!empty($pmpro_level))
-			$level_id = $pmpro_level->id;
-		else
-			$level_id = intval($_REQUEST['level']);
-
-		$options = pmpropbc_getOptions($level_id);
+		$options = pmpropbc_getOptions( $level->id );
 
     	if($options['setting'] == 2)
     		$gateway = "check";
@@ -310,10 +305,10 @@ function pmpropbc_init_include_billing_address_fields()
 		return;
 
 	//billing address and payment info fields
-	if(!empty($_REQUEST['level']))
+	$level = pmpro_getLevelAtCheckout();
+	if ( ! empty( $level->id ) )
 	{
-		$level_id = intval($_REQUEST['level']);
-		$options = pmpropbc_getOptions($level_id);
+		$options = pmpropbc_getOptions( $level->id );
 
 		if($options['setting'] == 2)
 		{