Fix for failing ActionMailer multipart tests
This commit is contained in:
parent
a98cd7ca9b
commit
57f0b85900
@ -244,14 +244,14 @@ def split(file)
|
|||||||
elsif m[1] && m[2] && valid_extension?(m[3]) # Multipart formats
|
elsif m[1] && m[2] && valid_extension?(m[3]) # Multipart formats
|
||||||
format = "#{m[1]}.#{m[2]}"
|
format = "#{m[1]}.#{m[2]}"
|
||||||
extension = m[3]
|
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
|
elsif valid_locale?(m[1]) && valid_extension?(m[2]) # locale and extension
|
||||||
locale = m[1]
|
locale = m[1]
|
||||||
extension = m[2]
|
extension = m[2]
|
||||||
elsif valid_extension?(m[2]) # format and extension
|
elsif valid_extension?(m[2]) # format and extension
|
||||||
format = m[1]
|
format = m[1]
|
||||||
extension = m[2]
|
extension = m[2]
|
||||||
|
elsif valid_extension?(m[1]) # Just extension
|
||||||
|
extension = m[1]
|
||||||
else # No extension
|
else # No extension
|
||||||
format = m[1]
|
format = m[1]
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user