JSON responder should return errors with :error root

1 files changed, 9 insertions, 1 deletions

diff --git a/actionpack/lib/action_controller/metal/responder.rb b/actionpack/lib/action_controller/metal/responder.rb
index 3794e277f6..c7827309dd 100644
--- a/actionpack/lib/action_controller/metal/responder.rb
+++ b/actionpack/lib/action_controller/metal/responder.rb
@@ -253,7 +253,7 @@ module ActionController #:nodoc:
     end
 
     def display_errors
-      controller.render format => resource.errors, :status => :unprocessable_entity
+      controller.render format => resource_errors, :status => :unprocessable_entity
     end
 
     # Check whether the resource has errors.
@@ -286,5 +286,13 @@ module ActionController #:nodoc:
     def empty_json_resource
       "{}"
     end
+
+    def resource_errors
+      respond_to?("#{format}_resource_errors") ? send("#{format}_resource_errors") : resource.errors
+    end
+
+    def json_resource_errors
+      {:errors => resource.errors}
+    end
   end
 end