Fixed problem causes by leftover backup templates ending in tilde [st…

…ate:committed #969] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
rails · Sep 10, 2008 · f3f7d16 · f3f7d16
1 parent 704fc37
commit f3f7d16
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
@@ -466,7 +466,7 @@ def create!(method_name, *parameters) #:nodoc:
             template = template_root["#{mailer_name}/#{File.basename(path)}"]
 
             # Skip unless template has a multipart format
-            next unless template.multipart?
+            next unless template && template.multipart?
 
             @parts << Part.new(
               :content_type => template.content_type,

diff --git a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.erb~ b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.erb~
@@ -0,0 +1,10 @@
+<html>
+  <body>
+    HTML formatted message to <strong><%= @recipient %></strong>.
+  </body>
+</html>
+<html>
+  <body>
+    HTML formatted message to <strong><%= @recipient %></strong>.
+  </body>
+</html>