From e6b9ddad18fb78b7dd17e9f422c9467ec14faa74 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 27 Feb 2012 20:43:25 +0000
Subject: Mailer#url_for not called in views with Rails 3.1.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9023 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/mailer/_issue.html.erb             | 2 +-
 app/views/mailer/document_added.html.erb     | 2 +-
 app/views/mailer/issue_edit.html.erb         | 4 ++--
 app/views/mailer/message_posted.html.erb     | 2 +-
 app/views/mailer/news_added.html.erb         | 2 +-
 app/views/mailer/news_comment_added.html.erb | 2 +-
 app/views/mailer/reminder.html.erb           | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'app/views')

diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb
index c649e44c9..3d851d442 100644
--- a/app/views/mailer/_issue.html.erb
+++ b/app/views/mailer/_issue.html.erb
@@ -12,4 +12,4 @@
 <% end %>
 </ul>
 
-<%= textilizable(issue, :description) %>
+<%= textilizable(issue, :description, :only_path => false) %>
diff --git a/app/views/mailer/document_added.html.erb b/app/views/mailer/document_added.html.erb
index be18e400d..8606dd784 100644
--- a/app/views/mailer/document_added.html.erb
+++ b/app/views/mailer/document_added.html.erb
@@ -1,3 +1,3 @@
 <%= link_to(h(@document.title), @document_url) %> (<%=h @document.category.name %>)<br />
 <br />
-<%= textilizable(@document, :description) %>
+<%= textilizable(@document, :description, :only_path => false) %>
diff --git a/app/views/mailer/issue_edit.html.erb b/app/views/mailer/issue_edit.html.erb
index da406f999..3aac5e44f 100644
--- a/app/views/mailer/issue_edit.html.erb
+++ b/app/views/mailer/issue_edit.html.erb
@@ -1,11 +1,11 @@
 <%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %>
 
 <ul>
-<% details_to_strings(@journal.details).each do |string| %>
+<% details_to_strings(@journal.details, false, :only_path => false).each do |string| %>
   <li><%= string %></li>
 <% end %>
 </ul>
 
-<%= textilizable(@journal, :notes) %>
+<%= textilizable(@journal, :notes, :only_path => false) %>
 <hr />
 <%= render :partial => "issue.html.erb", :locals => { :issue => @issue, :issue_url => @issue_url } %>
diff --git a/app/views/mailer/message_posted.html.erb b/app/views/mailer/message_posted.html.erb
index a8ccd2622..f43a8cf0f 100644
--- a/app/views/mailer/message_posted.html.erb
+++ b/app/views/mailer/message_posted.html.erb
@@ -1,4 +1,4 @@
 <h1><%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %></h1>
 <em><%=h @message.author %></em>
 
-<%= textilizable(@message, :content) %>
+<%= textilizable(@message, :content, :only_path => false) %>
diff --git a/app/views/mailer/news_added.html.erb b/app/views/mailer/news_added.html.erb
index 9a024c09e..758ebccb8 100644
--- a/app/views/mailer/news_added.html.erb
+++ b/app/views/mailer/news_added.html.erb
@@ -1,4 +1,4 @@
 <h1><%= link_to(h(@news.title), @news_url) %></h1>
 <em><%=h @news.author.name %></em>
 
-<%= textilizable(@news, :description) %>
+<%= textilizable(@news, :description, :only_path => false) %>
diff --git a/app/views/mailer/news_comment_added.html.erb b/app/views/mailer/news_comment_added.html.erb
index b96de1489..ef2be0f65 100644
--- a/app/views/mailer/news_comment_added.html.erb
+++ b/app/views/mailer/news_comment_added.html.erb
@@ -2,4 +2,4 @@
 
 <p><%= l(:text_user_wrote, :value => h(@comment.author)) %></p>
 
-<%= textilizable @comment, :comments %>
+<%= textilizable @comment, :comments, :only_path => false %>
diff --git a/app/views/mailer/reminder.html.erb b/app/views/mailer/reminder.html.erb
index cfe8c977d..f011da3e8 100644
--- a/app/views/mailer/reminder.html.erb
+++ b/app/views/mailer/reminder.html.erb
@@ -2,7 +2,7 @@
 
 <ul>
 <% @issues.each do |issue| -%>
-  <li><%=h issue.project %> - <%=link_to(h("#{issue.tracker} ##{issue.id}"), :controller => 'issues', :action => 'show', :id => issue)%>: <%=h issue.subject %></li>
+  <li><%=h issue.project %> - <%=link_to(h("#{issue.tracker} ##{issue.id}"), :controller => 'issues', :action => 'show', :id => issue, :only_path => false)%>: <%=h issue.subject %></li>
 <% end -%>
 </ul>
 
-- 
cgit v1.2.3