diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-01-26 13:15:29 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-01-26 13:15:29 -0600 |
| commit | 57f0b859004698a38d6aa7d5cebc00de3fcb346d (patch) | |
| tree | dc543e82e68ca5ef2d15f420c21848f6396d7ebb /actionpack/lib | |
| parent | a98cd7ca9b2f24a4500963e58ba5c37d6bdf9259 (diff) | |
| download | rails-57f0b859004698a38d6aa7d5cebc00de3fcb346d.tar.gz rails-57f0b859004698a38d6aa7d5cebc00de3fcb346d.tar.bz2 rails-57f0b859004698a38d6aa7d5cebc00de3fcb346d.zip | |
Fix for failing ActionMailer multipart tests
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/template.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb index 6f3bf576eb..1361a969a9 100644 --- a/actionpack/lib/action_view/template.rb +++ b/actionpack/lib/action_view/template.rb @@ -244,14 +244,14 @@ module ActionView #:nodoc: elsif m[1] && m[2] && valid_extension?(m[3]) # Multipart formats format = "#{m[1]}.#{m[2]}" extension = m[3] - elsif valid_extension?(m[1]) # Just extension - extension = m[1] elsif valid_locale?(m[1]) && valid_extension?(m[2]) # locale and extension locale = m[1] extension = m[2] elsif valid_extension?(m[2]) # format and extension format = m[1] extension = m[2] + elsif valid_extension?(m[1]) # Just extension + extension = m[1] else # No extension format = m[1] end |