aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-09-18 09:09:01 -0700
committerJosé Valim <jose.valim@gmail.com>2011-09-18 09:09:01 -0700
commit51bef9d8fb0b4da7a104425ab8545e9331387743 (patch)
tree27c6c8de2f8640b7b3ef2f279a2a4c66bca07863 /activerecord
parentcb0dbe35b85c910b4a75306d7d52ee4ca47b8d22 (diff)
downloadrails-51bef9d8fb0b4da7a104425ab8545e9331387743.tar.gz
rails-51bef9d8fb0b4da7a104425ab8545e9331387743.tar.bz2
rails-51bef9d8fb0b4da7a104425ab8545e9331387743.zip
to_xml should also rely on serializable hash.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/serializers/xml_serializer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/serializers/xml_serializer.rb b/activerecord/lib/active_record/serializers/xml_serializer.rb
index cbfa1ad609..0e7f57aa43 100644
--- a/activerecord/lib/active_record/serializers/xml_serializer.rb
+++ b/activerecord/lib/active_record/serializers/xml_serializer.rb
@@ -179,7 +179,7 @@ module ActiveRecord #:nodoc:
class XmlSerializer < ActiveModel::Serializers::Xml::Serializer #:nodoc:
def initialize(*args)
super
- options[:except] |= Array.wrap(@serializable.class.inheritance_column)
+ options[:except] = Array.wrap(options[:except]) | Array.wrap(@serializable.class.inheritance_column)
end
class Attribute < ActiveModel::Serializers::Xml::Serializer::Attribute #:nodoc: