Merge pull request #450 from misterion/master

willdurand · willdurand · commit ac8f538d111d · 2015-10-09T10:04:17.000+02:00
Fix emergency message in Geoip provider
diff --git a/src/Geocoder/Provider/Geoip.php b/src/Geocoder/Provider/Geoip.php
@@ -54,8 +54,13 @@ public function geocode($address)
             throw new NoResult(sprintf('Could not find "%s" IP address in database.', $address));
         }
 
-        $timezone = @geoip_time_zone_by_country_and_region($results['country_code'], $results['region']) ?: null;
-        $region   = @geoip_region_name_by_code($results['country_code'], $results['region']) ?: $results['region'];
+        if (!empty($results['region']) && !empty($results['country_code'])) {
+            $timezone = @geoip_time_zone_by_country_and_region($results['country_code'], $results['region']) ?: null;
+            $region   = @geoip_region_name_by_code($results['country_code'], $results['region']) ?: $results['region'];
+        } else {
+            $timezone = null;
+            $region = $results['region'];
+        }
 
         return $this->returnResults([
             $this->fixEncoding(array_merge($this->getDefaults(), [
