Fix error_messages_for when instance variable names are given.

Signed-off-by: Joshua Peek <josh@joshpeek.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/actionpack/lib/action_view/helpers/active_model_helper.rb b/actionpack/lib/action_view/helpers/active_model_helper.rb
index 3c398fe4da..c70f29f098 100644
--- a/actionpack/lib/action_view/helpers/active_model_helper.rb
+++ b/actionpack/lib/action_view/helpers/active_model_helper.rb
@@ -191,13 +191,13 @@ module ActionView
         options = params.extract_options!.symbolize_keys
 
         objects = Array.wrap(options.delete(:object) || params).map do |object|
-          unless object.respond_to?(:to_model)
-            object = instance_variable_get("@#{object}")
-            object = convert_to_model(object)
-          else
-            object = object.to_model
-            options[:object_name] ||= object.class.model_name.human
+          object = instance_variable_get("@#{object}") unless object.respond_to?(:to_model)
+          object = convert_to_model(object)
+
+          if object.class.respond_to?(:model_name)
+            options[:object_name] ||= object.class.model_name.human.downcase
           end
+
           object
         end