diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-10 09:41:28 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-10 09:41:28 -0700 |
| commit | ceaf73a503814d000167503888a62c1a393730d4 (patch) | |
| tree | 28fed0ac20ba91f31345e911c73e7247d16efe4e /activemodel/lib/active_model/serializers/xml.rb | |
| parent | 4de977117f5d7123aa97ab3837cc96ec19c68d33 (diff) | |
| parent | 2cef2d411a20b89b71fb76876c33b331f94d0cc5 (diff) | |
| download | rails-ceaf73a503814d000167503888a62c1a393730d4.tar.gz rails-ceaf73a503814d000167503888a62c1a393730d4.tar.bz2 rails-ceaf73a503814d000167503888a62c1a393730d4.zip | |
Merge pull request #492 from jaw6/master
Serialized methods that return nil should not be considered YAML
Diffstat (limited to 'activemodel/lib/active_model/serializers/xml.rb')
| -rw-r--r-- | activemodel/lib/active_model/serializers/xml.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activemodel/lib/active_model/serializers/xml.rb b/activemodel/lib/active_model/serializers/xml.rb index d4295e6afe..19639b1363 100644 --- a/activemodel/lib/active_model/serializers/xml.rb +++ b/activemodel/lib/active_model/serializers/xml.rb @@ -33,6 +33,7 @@ module ActiveModel protected def compute_type + return if value.nil? type = ActiveSupport::XmlMini::TYPE_NAMES[value.class.name] type ||= :string if value.respond_to?(:to_str) type ||= :yaml |