]> git.openstreetmap.org Git - rails.git/blobdiff - app/helpers/application_helper.rb
Tidy up the stylesheets
[rails.git] / app / helpers / application_helper.rb
index b77ac87215351fac98b7198179db05d9c4003e9d..c7187c31d62e932e94047f52ec222c4d9d221b3c 100644 (file)
@@ -2,19 +2,11 @@ module ApplicationHelper
   require 'rexml/document'
 
   def sanitize(text)
-    Sanitize.clean(text, Sanitize::Config::OSM)
+    Sanitize.clean(text, Sanitize::Config::OSM).html_safe
   end
 
   def htmlize(text)
-    logger.info "text safety is #{text.html_safe?}"
-    r = simple_format(text)
-    logger.info "formatted text safety is #{r.html_safe?}"
-    r = sanitize(r)
-    logger.info "sanitised text safety is #{r.html_safe?}"
-    r = linkify(r)
-    logger.info "linkified text safety is #{r.html_safe?}"
-    return r
-#    return linkify(sanitize(simple_format(text)))
+    return linkify(sanitize(simple_format(text)))
   end
 
   def linkify(text)
@@ -97,7 +89,7 @@ module ApplicationHelper
     url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
 
     begin
-      response = Timeout::timeout(4) do
+      response = OSM::Timer.timeout(4) do
         REXML::Document.new(Net::HTTP.get(URI.parse(url)))
       end
     rescue Exception