diff options
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 6 | ||||
| -rw-r--r-- | actionmailer/test/mail_render_test.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index f22880299a..cbf3628950 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,6 +1,6 @@ *SVN* -* Resolve conflict among mailer actions with the same name. #5520 [ssinghi@kreeti.com] +* Resolve action naming collision. #5520 [ssinghi@kreeti.com] * ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, Marcel Molina Jr.] diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index a84da1866d..81f240e035 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -353,7 +353,7 @@ module ActionMailer #:nodoc: content_type = md.captures[1].gsub('.', '/') @parts << Part.new(:content_type => content_type, :disposition => "inline", :charset => charset, - :body => render_message("#{mailer_name}/#{template_name}", @body)) + :body => render_message(template_name, @body)) end unless @parts.empty? @content_type = "multipart/alternative" @@ -367,7 +367,7 @@ module ActionMailer #:nodoc: # it. template_exists = @parts.empty? template_exists ||= Dir.glob("#{template_path}/#{@template}.*").any? { |i| File.basename(i).split(".").length == 2 } - @body = render_message("#{mailer_name}/#{@template}", @body) if template_exists + @body = render_message(@template, @body) if template_exists # Finally, if there are other message parts and a textual body exists, # we shift it onto the front of the parts and set the body to nil (so @@ -432,7 +432,7 @@ module ActionMailer #:nodoc: end def initialize_template_class(assigns) - ActionView::Base.new(template_root, assigns, self) + ActionView::Base.new(template_path, assigns, self) end def sort_parts(parts, order = []) diff --git a/actionmailer/test/mail_render_test.rb b/actionmailer/test/mail_render_test.rb index 642e15fe60..11ac4d1ed8 100644 --- a/actionmailer/test/mail_render_test.rb +++ b/actionmailer/test/mail_render_test.rb @@ -15,7 +15,7 @@ class RenderMailer < ActionMailer::Base recipients recipient subject "using helpers" from "tester@example.com" - body render(:file => "#{mailer_name}/signed_up", :body => { :recipient => recipient }) + body render(:file => "signed_up", :body => { :recipient => recipient }) end def initialize_defaults(method_name) |