Fix no method error with error_messages_on. Closes #6935 [nik.wakelin…

… Koz]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5870 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionpack/CHANGELOG

@@ -1,5 +1,7 @@
 *SVN*
 
+* Fix no method error with error_messages_on.  Closes #6935 [nik.wakelin Koz]
+
 * Slight doc tweak to the ActionView::Helpers::PrototypeHelper#replace docs.  Closes #6922 [Steven Bristol]
 
 * Slight doc tweak to #prepend_filter.  Closes #6493 [Jeremy Voorhis]

actionpack/lib/action_view/helpers/active_record_helper.rb

@@ -85,7 +85,7 @@ def form(record_name, options = {})
       #   <%= error_message_on "post", "title", "Title simply ", " (or it won't work)", "inputError" %> =>
       #     <div class="inputError">Title simply can't be empty (or it won't work)</div>
       def error_message_on(object, method, prepend_text = "", append_text = "", css_class = "formError")
-        if object = instance_variable_get("@#{object}") && errors = object.errors.on(method)
+        if (obj = instance_variable_get("@#{object}")) && (errors = obj.errors.on(method))
           content_tag("div", "#{prepend_text}#{errors.is_a?(Array) ? errors.first : errors}#{append_text}", :class => css_class)
         else 
           ''

actionpack/test/template/active_record_helper_test.rb

@@ -174,7 +174,11 @@ def test_error_messages_for_handles_nil
   def test_error_message_on_handles_nil
     assert_equal "", error_message_on("notthere", "notthere")
   end
-
+
+  def test_error_message_on
+    assert error_message_on(:post, :author_name)
+  end
+
   def test_error_messages_for_many_objects
     assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li><li>User email can't be empty</li></ul></div>), error_messages_for("post", "user")