diff options
| author | Yehuda Katz <wycats@gmail.com> | 2008-12-25 17:12:33 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2008-12-25 17:12:33 -0800 |
| commit | 69e349f1bb31c80215775956467fd54e00a2f0fe (patch) | |
| tree | 5c1cd0d3e20e7c8f4e07e2ee5e62949a1a5fce22 /actionpack/lib/action_view/base.rb | |
| parent | 061952392afd1dae1aa97a816e9a0c79df7c4514 (diff) | |
| download | rails-69e349f1bb31c80215775956467fd54e00a2f0fe.tar.gz rails-69e349f1bb31c80215775956467fd54e00a2f0fe.tar.bz2 rails-69e349f1bb31c80215775956467fd54e00a2f0fe.zip | |
Initial work to merge several places with similar logic
Diffstat (limited to 'actionpack/lib/action_view/base.rb')
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 8958e61e9d..50b79f5e35 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -266,7 +266,7 @@ module ActionView #:nodoc: if defined? @template_format @template_format elsif controller && controller.respond_to?(:request) - @template_format = controller.request.template_format.to_sym + @template_format = controller.request.format.to_sym else @template_format = :html end |