Merge branch 'master' of git://github.com/rails/rails

1 files changed, 7 insertions, 2 deletions

diff --git a/actionpack/lib/action_view/helpers/active_model_helper.rb b/actionpack/lib/action_view/helpers/active_model_helper.rb
index 4e12cdab54..80b3d3a664 100644
--- a/actionpack/lib/action_view/helpers/active_model_helper.rb
+++ b/actionpack/lib/action_view/helpers/active_model_helper.rb
@@ -3,6 +3,7 @@ require 'action_view/helpers/form_helper'
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/enumerable'
 require 'active_support/core_ext/kernel/reporting'
+require 'active_support/core_ext/object/blank'
 
 module ActionView
   ActionView.base_hook do
@@ -127,9 +128,9 @@ module ActionView
         object = convert_to_model(object)
 
         if (obj = (object.respond_to?(:errors) ? object : instance_variable_get("@#{object}"))) &&
-          (errors = obj.errors[method])
+          (errors = obj.errors[method]).presence
           content_tag("div",
-            (options[:prepend_text].html_safe << errors.first).safe_concat(options[:append_text]),
+            "#{options[:prepend_text]}#{ERB::Util.h(errors.first)}#{options[:append_text]}".html_safe,
             :class => options[:css_class]
           )
         else
@@ -295,6 +296,10 @@ module ActionView
         end
       end
 
+      def error_message
+        object.errors[@method_name]
+      end
+
       def column_type
         object.send(:column_for_attribute, @method_name).type
       end