diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2014-02-13 20:38:33 +0100 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2014-02-13 20:44:10 +0100 |
commit | bfc34fc0050ce61650701676dd45553aa82214c0 (patch) | |
tree | 6ae6b87760b806f0544842cd801088e1c8b4b1b9 /actionpack/lib/action_controller/metal | |
parent | f9e4c3c7c0c4152b62fe9202a9d12262884bb118 (diff) | |
download | rails-bfc34fc0050ce61650701676dd45553aa82214c0.tar.gz rails-bfc34fc0050ce61650701676dd45553aa82214c0.tar.bz2 rails-bfc34fc0050ce61650701676dd45553aa82214c0.zip |
No variant should also be picked up by variant.any if variant.none is not defined (just like any other variant)
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r-- | actionpack/lib/action_controller/metal/mime_responds.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb index c8076af0c8..1974bbf529 100644 --- a/actionpack/lib/action_controller/metal/mime_responds.rb +++ b/actionpack/lib/action_controller/metal/mime_responds.rb @@ -532,7 +532,7 @@ module ActionController #:nodoc: def variant if @variant.nil? - @variants[:none] + @variants[:none] || @variants[:any] elsif (@variants.keys & @variant).any? @variant.each do |v| return @variants[v] if @variants.key?(v) |