diff options
| author | Joshua Peek <josh@joshpeek.com> | 2008-07-13 14:05:21 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2008-07-13 14:05:21 -0500 |
| commit | 68fe898189a27e4e3c4c2fe005c99975d40e1dd7 (patch) | |
| tree | 07e7233469082ccce42c36899fd0b8545cdc1c93 /actionpack/lib/action_view/base.rb | |
| parent | 26bc867151a8f302b4c6122e6375c3ea2088a037 (diff) | |
| download | rails-68fe898189a27e4e3c4c2fe005c99975d40e1dd7.tar.gz rails-68fe898189a27e4e3c4c2fe005c99975d40e1dd7.tar.bz2 rails-68fe898189a27e4e3c4c2fe005c99975d40e1dd7.zip | |
Check first render format and extension. Fixes failing ActionMailer test.
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 9f244d7250..04e8d3a358 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -313,7 +313,7 @@ module ActionView #:nodoc: template elsif template = self.view_paths[template_file_name] template - elsif _first_render && template = self.view_paths["#{template_file_name}.#{_first_render.extension}"] + elsif _first_render && template = self.view_paths["#{template_file_name}.#{_first_render.format_and_extension}"] template elsif template_format == :js && template = self.view_paths["#{template_file_name}.html"] @template_format = :html |