Merge pull request #3192 from andrewlimaza/fix-pmpro-get-ip

Change pmpro_get_ip conditional
strangerstudios · Nov 18, 2024 · 3a62f91 · 3a62f91
2 parents 738ebdc + 605bfc7
commit 3a62f91
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/includes/functions.php b/includes/functions.php
@@ -4449,23 +4449,22 @@ function pmpro_get_ip() {
 			 */
 			$address_chain = explode( ',', sanitize_text_field( $_SERVER[ $header ] ) );
 			$client_ip     = trim( $address_chain[0] );
-
 			break;
 		}
 	}
 
 	if ( ! $client_ip ) {
 		return false;
 	}
-
-	// Check if it's a valid IP address or not.
-	if ( ! filter_var( $client_ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 ) || ! filter_var( $client_ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6 ) ) {
-		return false;
-	}
 
 	// Sanitize the IP
 	$client_ip = preg_replace( '/[^0-9a-fA-F:., ]/', '', $client_ip );
 
+	// Check if it's a valid IPv4 or IPv6 address.
+	if ( ! filter_var( $client_ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 ) && ! filter_var( $client_ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6 ) ) {
+		return false;
+	}
+
 	return $client_ip;
 }