TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix for failing ActionMailer multipart tests

Browse Source
This commit is contained in:
Joshua Peek 2009-01-26 13:15:29 -06:00
parent a98cd7ca9b
commit 57f0b85900
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actionpack/lib/action_view/template.rb
View File

@ -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