<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -463,7 +463,8 @@ module ActionMailer #:nodoc:
         # have not already been specified manually.
         if @parts.empty?
           Dir.glob(&quot;#{template_path}/#{@template}.*&quot;).each do |path|
-            template = template_root[&quot;#{mailer_name}/#{File.basename(path)}&quot;]
+            #template = template_root[&quot;#{mailer_name}/#{File.basename(path)}&quot;]
+            template = ActionView::PathSet::Path.new(File.dirname(File.dirname(path)),true)[&quot;#{mailer_name}/#{File.basename(path)}&quot;]
 
             # Skip unless template has a multipart format
             next unless template.multipart?</diff>
      <filename>actionmailer/lib/action_mailer/base.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>ed758017a0142a627313e52bfb20c2324e659493</id>
    </parent>
  </parents>
  <author>
    <name>Miles Georgi</name>
    <email>azimux@gmail.com</email>
  </author>
  <url>http://github.com/azimux/rails/commit/69ec3ce0fba49e454348786302a5ce7c35919835</url>
  <id>69ec3ce0fba49e454348786302a5ce7c35919835</id>
  <committed-date>2008-09-06T20:05:16-07:00</committed-date>
  <authored-date>2008-09-06T20:05:16-07:00</authored-date>
  <message>quick fix for problem finding mailer template when it might be in one of
multiple locations (not necessarily in template_root)

for example, when using the engines plugin with a plugin that supplies it's
own mailer template</message>
  <tree>b2f4265ede08c67f671f45d04d8eaa23b48dc4a8</tree>
  <committer>
    <name>Miles Georgi</name>
    <email>azimux@gmail.com</email>
  </committer>
</commit>
