aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-01-26 20:46:43 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-01-26 21:23:33 -0200
commitb03e55d17780b4ca9d4b962a426274af1f2e68a6 (patch)
treede763a8d04242148471eb0964b6bff9cece6ef62 /actionpack/lib
parente634efca99962fdbb83791a8daf9b0ceb9ff2f63 (diff)
downloadrails-b03e55d17780b4ca9d4b962a426274af1f2e68a6.tar.gz
rails-b03e55d17780b4ca9d4b962a426274af1f2e68a6.tar.bz2
rails-b03e55d17780b4ca9d4b962a426274af1f2e68a6.zip
Do not generate label for attribute when giving nil
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/tags/label.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/tags/label.rb b/actionpack/lib/action_view/helpers/tags/label.rb
index 74ac92ee18..1bd71c2778 100644
--- a/actionpack/lib/action_view/helpers/tags/label.rb
+++ b/actionpack/lib/action_view/helpers/tags/label.rb
@@ -30,7 +30,7 @@ module ActionView
add_default_name_and_id_for_value(tag_value, name_and_id)
options.delete("index")
options.delete("namespace")
- options["for"] ||= name_and_id["id"]
+ options["for"] = name_and_id["id"] unless options.key?("for")
if block_given?
@template_object.label_tag(name_and_id["id"], options, &block)