Tighten the rescue clause when dealing with invalid instance variable…

… names in form_helper.
rails · Jul 3, 2008 · 75e04b5 · 75e04b5
1 parent d79cde3
commit 75e04b5
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -601,7 +601,11 @@ def to_content_tag(tag_name, options = {})
       end
 
       def object
-        @object || (@template_object.instance_variable_get("@#{@object_name}") rescue nil)
+        @object || @template_object.instance_variable_get("@#{@object_name}")
+      rescue NameError
+        # As @object_name may contain the nested syntax (item[subobject]) we
+        # need to fallback to nil.
+        nil
       end
 
       def value(object)