diff --git a/rails-2.0/app/models/mailer.rb b/rails-2.0/app/models/mailer.rb index d85395981..257f57726 100644 --- a/rails-2.0/app/models/mailer.rb +++ b/rails-2.0/app/models/mailer.rb @@ -152,4 +152,9 @@ class Mailer < ActionMailer::Base body[:content_for_layout] = render(:file => method_name, :body => body) ActionView::Base.new(template_root, body, self).render(:file => "mailer/#{layout}") end + + # Makes partial rendering work with Rails 1.2 (retro-compatibility) + def self.controller_path + '' + end unless respond_to?('controller_path') end diff --git a/rails-2.0/app/views/mailer/issue_add.text.html.rhtml b/rails-2.0/app/views/mailer/issue_add.text.html.rhtml index adcb4c9fe..6d20c333f 100644 --- a/rails-2.0/app/views/mailer/issue_add.text.html.rhtml +++ b/rails-2.0/app/views/mailer/issue_add.text.html.rhtml @@ -1,3 +1,3 @@ <%= l(:text_issue_added, "##{@issue.id}") %>
-<%= render :file => "_issue_text_html", :use_full_path => true, :locals => { :issue => @issue, :issue_url => @issue_url } %> +<%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %> diff --git a/rails-2.0/app/views/mailer/issue_add.text.plain.rhtml b/rails-2.0/app/views/mailer/issue_add.text.plain.rhtml index 797fb11b6..38c17e777 100644 --- a/rails-2.0/app/views/mailer/issue_add.text.plain.rhtml +++ b/rails-2.0/app/views/mailer/issue_add.text.plain.rhtml @@ -1,3 +1,3 @@ <%= l(:text_issue_added, "##{@issue.id}") %> ---------------------------------------- -<%= render :file => "_issue_text_plain", :use_full_path => true, :locals => { :issue => @issue, :issue_url => @issue_url } %> +<%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %> diff --git a/rails-2.0/app/views/mailer/issue_edit.text.html.rhtml b/rails-2.0/app/views/mailer/issue_edit.text.html.rhtml index 40d34968e..9af8592b4 100644 --- a/rails-2.0/app/views/mailer/issue_edit.text.html.rhtml +++ b/rails-2.0/app/views/mailer/issue_edit.text.html.rhtml @@ -7,4 +7,4 @@ <%= textilizable(@journal.notes) %>
-<%= render :file => "_issue_text_html", :use_full_path => true, :locals => { :issue => @issue, :issue_url => @issue_url } %> +<%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %> diff --git a/rails-2.0/app/views/mailer/issue_edit.text.plain.rhtml b/rails-2.0/app/views/mailer/issue_edit.text.plain.rhtml index 32019eaea..04b1bc54a 100644 --- a/rails-2.0/app/views/mailer/issue_edit.text.plain.rhtml +++ b/rails-2.0/app/views/mailer/issue_edit.text.plain.rhtml @@ -5,4 +5,4 @@ <% end %> <%= @journal.notes if @journal.notes? %> ---------------------------------------- -<%= render :file => "_issue_text_plain", :use_full_path => true, :locals => { :issue => @issue, :issue_url => @issue_url } %> +<%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %>