fix a couple of escaping issues in edge rails

robholland · Feb 19, 2010 · 70de24e · 70de24e
1 parent 9599f83
commit 70de24e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/simple_form/components/labels.rb b/lib/simple_form/components/labels.rb
@@ -28,7 +28,7 @@ def label
       end
 
       def label_text
-        SimpleForm.label_text.call(raw_label_text, required_label_text)
+        SimpleForm.label_text.call(raw_label_text, required_label_text).html_safe
       end
 
       def label_target

diff --git a/lib/simple_form/inputs/base.rb b/lib/simple_form/inputs/base.rb
@@ -39,7 +39,7 @@ def render
           send(component)
         end
         content.compact!
-        wrap(content.join).html_safe
+        wrap(content.join.html_safe)
       end
 
     protected