| @@ -398,9 +398,9 @@ | ||
| 398 | 398 | * |
| 399 | 399 | * @return array|false The formatted address array, or false if invalid. |
| 400 | 400 | */ |
| 401 | 401 | private static function format_address_for_paypal( $address, $address_field_id ) { |
| 402 | - if ( ! is_array( $address ) || ! isset( $address['line1'] ) || ! is_callable( 'FrmProAddressesController::get_country_code' ) ) { | |
| 402 | + if ( ! is_array( $address ) || ! isset( $address['line1'] ) ) { | |
| 403 | 403 | return false; |
| 404 | 404 | } |
| 405 | 405 | |
| 406 | 406 | $address_field = FrmField::getOne( $address_field_id ); |
| @@ -411,9 +411,9 @@ | ||
| 411 | 411 | |
| 412 | 412 | if ( 'us' === $address_field->field_options['address_type'] ) { |
| 413 | 413 | $country_code = 'US'; |
| 414 | 414 | } else { |
| 415 | - $country_code = FrmProAddressesController::get_country_code( $address['country'] ); | |
| 415 | + $country_code = FrmAddressesController::get_country_code( $address['country'] ); | |
| 416 | 416 | } |
| 417 | 417 | |
| 418 | 418 | if ( ! $address['line1'] || ! $address['city'] || ! $address['state'] || ! $address['zip'] || ! $country_code ) { |
| 419 | 419 | return false; |
| @@ -461,9 +461,9 @@ | ||
| 461 | 461 | * |
| 462 | 462 | * @return void |
| 463 | 463 | */ |
| 464 | 464 | private static function maybe_add_address_data( &$payer, $address, $address_field_id ) { |
| 465 | - if ( ! is_array( $address ) || ! isset( $address['line1'] ) || ! is_callable( 'FrmProAddressesController::get_country_code' ) ) { | |
| 465 | + if ( ! is_array( $address ) || ! isset( $address['line1'] ) ) { | |
| 466 | 466 | return; |
| 467 | 467 | } |
| 468 | 468 | |
| 469 | 469 | $address_field = FrmField::getOne( $address_field_id ); |
| @@ -474,9 +474,9 @@ | ||
| 474 | 474 | |
| 475 | 475 | if ( 'us' === $address_field->field_options['address_type'] ) { |
| 476 | 476 | $country_code = 'US'; |
| 477 | 477 | } else { |
| 478 | - $country_code = FrmProAddressesController::get_country_code( $address['country'] ); | |
| 478 | + $country_code = FrmAddressesController::get_country_code( $address['country'] ); | |
| 479 | 479 | } |
| 480 | 480 | |
| 481 | 481 | if ( ! $address['line1'] || ! $address['city'] || ! $address['state'] || ! $address['zip'] || ! $country_code ) { |
| 482 | 482 | return; |
