diff options
author | José Valim <jose.valim@gmail.com> | 2010-11-28 22:40:32 +0100 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-02-08 14:14:26 -0800 |
commit | 6b1018526fb304727ee4191afc2d8a5e29e49eea (patch) | |
tree | 33e57e76341028a8bd42bf8cac33b038fbd3dcf2 /actionpack/lib/action_view | |
parent | b93c590297ba65a6c5b18655a7790163abcb06f1 (diff) | |
download | rails-6b1018526fb304727ee4191afc2d8a5e29e49eea.tar.gz rails-6b1018526fb304727ee4191afc2d8a5e29e49eea.tar.bz2 rails-6b1018526fb304727ee4191afc2d8a5e29e49eea.zip |
Use Mime::Type references.
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r-- | actionpack/lib/action_view/lookup_context.rb | 4 | ||||
-rw-r--r-- | actionpack/lib/action_view/template.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb index e434f3b059..06c607931d 100644 --- a/actionpack/lib/action_view/lookup_context.rb +++ b/actionpack/lib/action_view/lookup_context.rb @@ -164,11 +164,11 @@ module ActionView @frozen_formats = true end - # Overload formats= to reject [:"*/*"] values. + # Overload formats= to reject ["*/*"] values. def formats=(values) if values && values.size == 1 value = values.first - values = nil if value == :"*/*" + values = nil if value == "*/*" values << :html if value == :js end super(values) diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb index 80543a8b77..96d506fac5 100644 --- a/actionpack/lib/action_view/template.rb +++ b/actionpack/lib/action_view/template.rb @@ -123,7 +123,7 @@ module ActionView @locals = details[:locals] || [] @virtual_path = details[:virtual_path] @updated_at = details[:updated_at] || Time.now - @formats = Array.wrap(format).map(&:to_sym) + @formats = Array.wrap(format).map { |f| f.is_a?(Mime::Type) ? f.ref : f } end # Render a template. If the template was not compiled yet, it is done |