fix a couple of escaping issues in edge rails

2010-02-19 03:53:38 +08:00 · 2010-02-19 03:53:38 +08:00 · 70de24e12c
parent 9599f83d60
commit 70de24e12c
2 changed files with 2 additions and 2 deletions
--- a/lib/simple_form/components/labels.rb
+++ b/lib/simple_form/components/labels.rb
@ -28,7 +28,7 @@ module SimpleForm
      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
--- a/lib/simple_form/inputs/base.rb
+++ b/lib/simple_form/inputs/base.rb
@ -39,7 +39,7 @@ module SimpleForm
          send(component)
        end
        content.compact!
-        wrap(content.join).html_safe
+        wrap(content.join.html_safe)
      end

    protected