Fix layout selection to detect OAuth correctly

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index a85a7dfecd91be7d22ee18f07c3e8c252371932a..c85abc0f3cf5c426a11f2f7b337d414192161caa 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -6,7 +6,6 @@ module OSM
   require 'rexml/text'
   require 'xml/libxml'
   require 'digest/md5'
-  require 'RMagick'
   require 'nokogiri'
 
   if defined?(SystemTimer)
@@ -455,7 +454,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 +516,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|