Fixed: URLs broken in wiki notifications (#6838).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4373 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed: URLs broken in wiki notifications (#6838).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4373 e93f8b46-1217-0410-a6f0-8f06a7374b81
338e407a · Jean-Philippe Lang · 6f841b7f · 338e407a
Commit 338e407a authored Nov 06, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

mailer.rb app/models/mailer.rb +3 -3

No files found.
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -180,7 +180,7 @@ class Mailer < ActionMailer::Base
    cc(wiki_content.page.wiki.watcher_recipients - recipients)
    subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_added, :id => wiki_content.page.pretty_title)}"
    body :wiki_content => wiki_content,
-         :wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :id => wiki_content.page.title)
+         :wiki_content_url => url_for(:controller => 'wiki', :action => 'show', :project_id => wiki_content.project, :id => wiki_content.page.title)
    render_multipart('wiki_content_added', body)
  end
  
@@ -197,8 +197,8 @@ class Mailer < ActionMailer::Base
    cc(wiki_content.page.wiki.watcher_recipients + wiki_content.page.watcher_recipients - recipients)
    subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_updated, :id => wiki_content.page.pretty_title)}"
    body :wiki_content => wiki_content,
-         :wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :id => wiki_content.page.title),
-         :wiki_diff_url => url_for(:controller => 'wiki', :action => 'diff', :id => wiki_content.project, :id => wiki_content.page.title, :version => wiki_content.version)
+         :wiki_content_url => url_for(:controller => 'wiki', :action => 'show', :project_id => wiki_content.project, :id => wiki_content.page.title),
+         :wiki_diff_url => url_for(:controller => 'wiki', :action => 'diff', :project_id => wiki_content.project, :id => wiki_content.page.title, :version => wiki_content.version)
    render_multipart('wiki_content_updated', body)
  end