From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sat, 20 Aug 2011 06:54:00 +0000 (+0000)
Subject: Rails3: use String#html_safe for label_for_field() at lib/tabular_form_builder.rb.
X-Git-Tag: 1.3.0~1488
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=89fd138503ba5cc99028fcdeafcb264516a70438;p=redmine.git

Rails3: use String#html_safe for label_for_field() at lib/tabular_form_builder.rb.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6473 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/tabular_form_builder.rb b/lib/tabular_form_builder.rb
index 8dc5265d5..0509e2065 100644
--- a/lib/tabular_form_builder.rb
+++ b/lib/tabular_form_builder.rb
@@ -40,11 +40,11 @@ class TabularFormBuilder < ActionView::Helpers::FormBuilder
   
   # Returns a label tag for the given field
   def label_for_field(field, options = {})
-      return '' if options.delete(:no_label)
+      return ''.html_safe if options.delete(:no_label)
       text = options[:label].is_a?(Symbol) ? l(options[:label]) : options[:label]
       text ||= l(("field_" + field.to_s.gsub(/\_id$/, "")).to_sym)
       text += @template.content_tag("span", " *", :class => "required") if options.delete(:required)
-      @template.content_tag("label", text, 
+      @template.content_tag("label", text.html_safe, 
                                      :class => (@object && @object.errors[field] ? "error" : nil), 
                                      :for => (@object_name.to_s + "_" + field.to_s))
   end