diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-12 16:13:00 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-12 16:13:00 -0300 |
| commit | 0048897a417774f7e5a0c8c9e82fc8684f94ebc1 (patch) | |
| tree | 8df248dab434bdaac61ea60249d4630958260eed /activerecord/lib/active_record/serializers | |
| parent | 6c7d8cb8ac9e6b6775e9a54ef0be62dbaab592f5 (diff) | |
| parent | 22c5667c2ef46d6723c1805d3adc52dc8e92429b (diff) | |
| download | rails-0048897a417774f7e5a0c8c9e82fc8684f94ebc1.tar.gz rails-0048897a417774f7e5a0c8c9e82fc8684f94ebc1.tar.bz2 rails-0048897a417774f7e5a0c8c9e82fc8684f94ebc1.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activerecord/lib/active_record/serializers')
| -rw-r--r-- | activerecord/lib/active_record/serializers/json_serializer.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/serializers/json_serializer.rb b/activerecord/lib/active_record/serializers/json_serializer.rb index 48df15d2c0..d376fd5e1b 100644 --- a/activerecord/lib/active_record/serializers/json_serializer.rb +++ b/activerecord/lib/active_record/serializers/json_serializer.rb @@ -2,9 +2,10 @@ require 'active_support/json' module ActiveRecord #:nodoc: module Serialization - def self.included(base) - base.cattr_accessor :include_root_in_json, :instance_writer => false - base.extend ClassMethods + extend ActiveSupport::DependencyModule + + included do + cattr_accessor :include_root_in_json, :instance_writer => false end # Returns a JSON string representing the model. Some configuration is |