X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/00a605a2a877528ec3d4eabc6562e262c427b839..4de07696d51d5b053fa6af2c0a5aa4d0b89d60b7:/lib/osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index a85a7dfec..c4781ca41 100644
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -455,7 +455,7 @@ module OSM
   end
 
   def self.IPToCountry(ip_address)
-    Timeout::timeout(4) do
+    Timer.timeout(4) do
       ipinfo = Quova::IpInfo.new(ip_address)
 
       if ipinfo.status == Quova::Success then
@@ -517,7 +517,7 @@ module OSM
     link_count = 0
     link_size = 0
 
-    doc = Nokogiri::HTML(text)
+    doc = Nokogiri::HTML(Rinku.auto_link(text, :urls))
 
     if doc.content.length > 0
       doc.xpath("//a").each do |link|