aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/form_helper.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-09-27 21:00:54 +0200
committerJosé Valim <jose.valim@gmail.com>2010-09-27 21:00:54 +0200
commitfe0251e408a8b5d1ee149c7cad7bcfc495ce1595 (patch)
tree620f92c8485809ded3cd4081966d147efc8ad806 /actionpack/lib/action_view/helpers/form_helper.rb
parent6067d1620075c1c311bbae01993453cd80967804 (diff)
parent50decfbc0e2e58961cc3665710922860d38ee2fb (diff)
downloadrails-fe0251e408a8b5d1ee149c7cad7bcfc495ce1595.tar.gz
rails-fe0251e408a8b5d1ee149c7cad7bcfc495ce1595.tar.bz2
rails-fe0251e408a8b5d1ee149c7cad7bcfc495ce1595.zip
Merge remote branch 'miloops/warnings'
Conflicts: actionpack/lib/action_controller/metal/url_for.rb
Diffstat (limited to 'actionpack/lib/action_view/helpers/form_helper.rb')
-rw-r--r--actionpack/lib/action_view/helpers/form_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 3ebc6601e5..8bae6d2796 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -1237,7 +1237,7 @@ module ActionView
end
def emitted_hidden_id?
- @emitted_hidden_id
+ @emitted_hidden_id ||= nil
end
private