From 57f0b859004698a38d6aa7d5cebc00de3fcb346d Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 26 Jan 2009 13:15:29 -0600
Subject: Fix for failing ActionMailer multipart tests

---
 actionpack/lib/action_view/template.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

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
-- 
cgit v1.2.3