diff options
| author | Michael S. Klishin <michael@novemberain.com> | 2008-12-28 22:05:27 +0300 |
|---|---|---|
| committer | Michael S. Klishin <michael@novemberain.com> | 2008-12-28 22:05:43 +0300 |
| commit | 12bff2af4081c25682d0466b1d7380b702c27417 (patch) | |
| tree | 50f12abeb5dc70f4a847e8a960e2a60ee026ad97 /actionpack/lib/action_view/base.rb | |
| parent | 89e98955c79b39ec408efb39cde07d6f14997183 (diff) | |
| parent | d77deb89d54b18c662ae3de103802e4d7a9d7d08 (diff) | |
| download | rails-12bff2af4081c25682d0466b1d7380b702c27417.tar.gz rails-12bff2af4081c25682d0466b1d7380b702c27417.tar.bz2 rails-12bff2af4081c25682d0466b1d7380b702c27417.zip | |
Sync with wycats/rails/master
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 |