osCommerce /
oscommerce2
| @@ 410-420 (lines=11) @@ | ||
| 407 | $suburb = tep_output_string_protected($address['suburb']); |
|
| 408 | $city = tep_output_string_protected($address['city']); |
|
| 409 | $state = tep_output_string_protected($address['state']); |
|
| 410 | if (isset($address['country_id']) && tep_not_null($address['country_id'])) { |
|
| 411 | $country = tep_get_country_name($address['country_id']); |
|
| 412 | ||
| 413 | if (isset($address['zone_id']) && tep_not_null($address['zone_id'])) { |
|
| 414 | $state = tep_get_zone_code($address['country_id'], $address['zone_id'], $state); |
|
| 415 | } |
|
| 416 | } elseif (isset($address['country']) && tep_not_null($address['country'])) { |
|
| 417 | $country = tep_output_string_protected($address['country']); |
|
| 418 | } else { |
|
| 419 | $country = ''; |
|
| 420 | } |
|
| 421 | $postcode = tep_output_string_protected($address['postcode']); |
|
| 422 | $zip = $postcode; |
|
| 423 | ||
| @@ 467-477 (lines=11) @@ | ||
| 464 | $suburb = tep_output_string_protected($address['suburb']); |
|
| 465 | $city = tep_output_string_protected($address['city']); |
|
| 466 | $state = tep_output_string_protected($address['state']); |
|
| 467 | if (isset($address['country_id']) && tep_not_null($address['country_id'])) { |
|
| 468 | $country = tep_get_country_name($address['country_id']); |
|
| 469 | ||
| 470 | if (isset($address['zone_id']) && tep_not_null($address['zone_id'])) { |
|
| 471 | $state = tep_get_zone_code($address['country_id'], $address['zone_id'], $state); |
|
| 472 | } |
|
| 473 | } elseif (isset($address['country']) && tep_not_null($address['country'])) { |
|
| 474 | $country = tep_output_string_protected($address['country']['title']); |
|
| 475 | } else { |
|
| 476 | $country = ''; |
|
| 477 | } |
|
| 478 | $postcode = tep_output_string_protected($address['postcode']); |
|
| 479 | $zip = $postcode; |
|
| 480 | ||
