Bounding boxes are sanitised on creation now

[rails.git] / app / helpers / application_helper.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b77ac87215351fac98b7198179db05d9c4003e9d..b30129c5dd51233a6b66b1ebb44b11e0171df9d1 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -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)
@@ -141,6 +133,26 @@ module ApplicationHelper
     end
   end
 
+  def friendly_date(date)
+    content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly))
+  end
+
+  def note_author(object, link_options = {})
+    if object.author.nil?
+      h(object.author_name)
+    else
+      link_to h(object.author_name), link_options.merge({:controller => "user", :action => "view", :display_name => object.author_name})
+    end
+  end
+
+  def with_format(format, &block)
+    old_format = @template_format
+    @template_format = format
+    result = block.call
+    @template_format = old_format
+    return result
+  end
+
 private
 
   def javascript_strings_for_key(key)