Merge remote-tracking branch 'upstream/pull/2496'

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index bc3eb48c5bcaf71034ff670d36546fb27c67a353..26ebca09f9a7a235a820b533be5c8742b6d89e09 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -513,7 +513,7 @@ module OSM
   def self.ip_to_country(ip_address)
     ipinfo = maxmind_database.lookup(ip_address) if Settings.key?(:maxmind_database)
 
-    if ipinfo.found?
+    if ipinfo&.found?
       country = ipinfo.country.iso_code
     else
       country = http_client.get("https://api.hostip.info/country.php?ip=#{ip_address}").body