1 files changed, 7 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/serializers/json_serializer.rb b/activerecord/lib/active_record/serializers/json_serializer.rb
index c709c3f1eb..e9cb8bfca9 100644
--- a/activerecord/lib/active_record/serializers/json_serializer.rb
+++ b/activerecord/lib/active_record/serializers/json_serializer.rb
@@ -74,13 +74,17 @@ module ActiveRecord #:nodoc:
     #                   {"comments": [{"body": "Don't think too hard"}],
     #                    "title": "So I was thinking"}]}
     def to_json(options = {})
+      json = JsonSerializer.new(self, options).to_s
       if include_root_in_json
-        "{#{self.class.json_class_name}: #{JsonSerializer.new(self, options).to_s}}"
+        "{#{self.class.json_class_name}:#{json}}"
       else
-        JsonSerializer.new(self, options).to_s
+        json
       end
     end
 
+    # For compatibility with ActiveSupport::JSON.encode
+    alias rails_to_json to_json
+
     def from_json(json)
       self.attributes = ActiveSupport::JSON.decode(json)
       self
@@ -88,7 +92,7 @@ module ActiveRecord #:nodoc:
 
     class JsonSerializer < ActiveRecord::Serialization::Serializer #:nodoc:
       def serialize
-        serializable_record.to_json
+        ActiveSupport::JSON.encode(serializable_record)
       end
     end