Permalink
Browse files

Fix for failing ActionMailer multipart tests

  • Loading branch information...
1 parent a98cd7c commit 57f0b859004698a38d6aa7d5cebc00de3fcb346d @josh josh committed Jan 26, 2009
Showing with 2 additions and 2 deletions.
  1. +2 −2 actionpack/lib/action_view/template.rb
@@ -244,14 +244,14 @@ def split(file)
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

0 comments on commit 57f0b85

Please sign in to comment.