Make more Template methods public to make ActionMailer tests pass

2 files changed, 9 insertions, 9 deletions

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 88932eb96f..9eee5783a0 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -474,7 +474,7 @@ module ActionMailer #:nodoc:
         # have not already been specified manually.
         if @parts.empty?
           Dir.glob("#{template_path}/#{@template}.*").each do |path|
-            template = template_root.find_template("#{mailer_name}/#{File.basename(path)}")
+            template = template_root.find_by_parts("#{mailer_name}/#{File.basename(path)}")
 
             # Skip unless template has a multipart format
             next unless template && template.multipart?
diff --git a/actionpack/lib/action_view/template/template.rb b/actionpack/lib/action_view/template/template.rb
index fd9cbb494d..0d2f201458 100644
--- a/actionpack/lib/action_view/template/template.rb
+++ b/actionpack/lib/action_view/template/template.rb
@@ -95,6 +95,14 @@ module ActionView #:nodoc:
     end
     memoize :mime_type      
     
+    def multipart?
+      format && format.include?('.')
+    end    
+    
+    def content_type
+      format.gsub('.', '/')
+    end    
+    
   private
     
     def format_and_extension
@@ -102,14 +110,6 @@ module ActionView #:nodoc:
     end
     memoize :format_and_extension
 
-    def multipart?
-      format && format.include?('.')
-    end
-
-    def content_type
-      format.gsub('.', '/')
-    end
-
     def mtime
       File.mtime(filename)
     end