Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/25361' of github.com:woocommerce/woocommerce into fix/25361

This commit is contained in:
Rodrigo Primo 2020-01-14 16:47:06 -03:00
parent 23e1abe1dc f9c31589c6
commit efb200799d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/class-wc-geolocation.php
View File

@ -164,7 +164,7 @@ class WC_Geolocation {
$geolocation = apply_filters(
'woocommerce_get_geolocation',
array(
'country' => $country_code ? $country_code : '',
'country' => $country_code,
'state' => '',
'city' => '',
'postcode' => '',
@ -173,13 +173,13 @@ class WC_Geolocation {
);
// If we still haven't found a country code, let's consider doing an API lookup.
if ( false === $geolocation['country'] && $api_fallback ) {
if ( '' === $geolocation['country'] && $api_fallback ) {
$geolocation['country'] = self::geolocate_via_api( $ip_address );
}
// It's possible that we're in a local environment, in which case the geolocation needs to be done from the
// external address.
if ( false === $geolocation['country'] && $fallback ) {
if ( '' === $geolocation['country'] && $fallback ) {
$external_ip_address = self::get_external_ip_address();
// Only bother with this if the external IP differs.