diff options
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 33c71407bb..183ed75d93 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -403,19 +403,7 @@ module ActionView #:nodoc: # symbolized version of the :format parameter of the request, or :html by default. def template_format - if @template_format.nil? - @template_format = - begin - if controller.request.accepts.first == Mime::JS - :js - else - controller.request.parameters[:format].to_sym - end - rescue - :html - end - end - @template_format + @template_format ||= controller.request.parameters[:format].to_sym rescue :html end def template_handler_preferences |