diff options
| author | José Valim <jose.valim@gmail.com> | 2010-09-29 10:04:42 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-09-29 10:04:42 +0200 |
| commit | 0bbf9029e8089356aed0e3be2f859d56951a89cf (patch) | |
| tree | 38e41ef8b63140a91c828bec03e06e83f38899b6 /actionpack/lib/action_view/helpers/form_helper.rb | |
| parent | 006cef7107b648882cfc09f56904c601454cfc77 (diff) | |
| parent | 17599abc9c06f30ff23d7ad47a3f029e32c26c88 (diff) | |
| download | rails-0bbf9029e8089356aed0e3be2f859d56951a89cf.tar.gz rails-0bbf9029e8089356aed0e3be2f859d56951a89cf.tar.bz2 rails-0bbf9029e8089356aed0e3be2f859d56951a89cf.zip | |
Merge remote branch 'miloops/warnings'
Diffstat (limited to 'actionpack/lib/action_view/helpers/form_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index 8bae6d2796..7e49052c24 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -991,7 +991,11 @@ module ActionView end def object - @object || @template_object.instance_variable_get("@#{@object_name}") + if @object + @object + elsif @template_object.instance_variable_defined?("@#{@object_name}") + @template_object.instance_variable_get("@#{@object_name}") + end rescue NameError # As @object_name may contain the nested syntax (item[subobject]) we # need to fallback to nil. |