diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-22 16:50:26 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-22 16:55:27 -0700 |
| commit | 28dbeb3a643eeb35767df55ed579f54438c3ee18 (patch) | |
| tree | 67d8e6dfa2d4fc7a7811175a3250ef8ff5bd8bba /actionpack/lib/action_view | |
| parent | 63ed43cb9901cc7adc352a51fa256c3ba7b6637f (diff) | |
| download | rails-28dbeb3a643eeb35767df55ed579f54438c3ee18.tar.gz rails-28dbeb3a643eeb35767df55ed579f54438c3ee18.tar.bz2 rails-28dbeb3a643eeb35767df55ed579f54438c3ee18.zip | |
Get controller/render_other_test.rb to pass on new base and fixed a bug in new base with regards to rendering layouts.
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/template/template.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/template/template.rb b/actionpack/lib/action_view/template/template.rb index d58f4ec19e..f61dd591a5 100644 --- a/actionpack/lib/action_view/template/template.rb +++ b/actionpack/lib/action_view/template/template.rb @@ -15,11 +15,12 @@ module ActionView @handler = handler @details = details - format = details[:format] || begin + format = details.delete(:format) || begin # TODO: Clean this up handler.respond_to?(:default_format) ? handler.default_format.to_sym.to_s : "html" end @mime_type = Mime::Type.lookup_by_extension(format.to_s) + @details[:formats] = Array.wrap(format && format.to_sym) end def render(view, locals, &blk) |