diff options
author | Piotr Sarnacki <drogus@gmail.com> | 2012-06-15 17:17:21 +0200 |
---|---|---|
committer | Piotr Sarnacki <drogus@gmail.com> | 2012-08-28 10:51:04 +0200 |
commit | f21a528f5508430bf9281dffe938bda6c9fbd84b (patch) | |
tree | 97bc6a92f13eb04b3eb4bb4f91264137f271cbdc /actionpack/lib/action_view/template.rb | |
parent | 7abc0c73bdaa004948f89336b0c4dfeb1f357269 (diff) | |
download | rails-f21a528f5508430bf9281dffe938bda6c9fbd84b.tar.gz rails-f21a528f5508430bf9281dffe938bda6c9fbd84b.tar.bz2 rails-f21a528f5508430bf9281dffe938bda6c9fbd84b.zip |
Remove Mime::Type translations from Action View
Action View should not be responsible for translating mime types. Any
translation that's needed should be handled at controller level.
Diffstat (limited to 'actionpack/lib/action_view/template.rb')
-rw-r--r-- | actionpack/lib/action_view/template.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb index a04eac1d3f..8c9310533c 100644 --- a/actionpack/lib/action_view/template.rb +++ b/actionpack/lib/action_view/template.rb @@ -121,7 +121,7 @@ module ActionView @locals = details[:locals] || [] @virtual_path = details[:virtual_path] @updated_at = details[:updated_at] || Time.now - @formats = Array(format).map { |f| f.is_a?(Mime::Type) ? f.ref : f } + @formats = Array(format).map { |f| f.to_sym } @compile_mutex = Mutex.new end @@ -146,8 +146,8 @@ module ActionView handle_render_error(view, e) end - def mime_type - @mime_type ||= Mime::Type.lookup_by_extension(@formats.first.to_s) if @formats.first + def type + @type ||= @formats.first.to_sym if @formats.first end # Receives a view object and return a template similar to self by using @virtual_path. |