[Haml] Don't run html_safe on form_tag if it's not actually returning…

… a string.
johnreilly · Mar 2, 2010 · f9607ae · f9607ae
1 parent 76fa7cc
commit f9607ae
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/haml/helpers/xss_mods.rb b/lib/haml/helpers/xss_mods.rb
@@ -99,7 +99,9 @@ module ActionView
   module Helpers
     module FormTagHelper
       def form_tag_with_haml_xss(*args, &block)
-        Haml::Util.html_safe(form_tag_without_haml_xss(*args, &block))
+        res = form_tag_without_haml_xss(*args, &block)
+        res = Haml::Util.html_safe(res) unless block_given?
+        res
       end
       alias_method :form_tag_without_haml_xss, :form_tag
       alias_method :form_tag, :form_tag_with_haml_xss