summaryrefslogtreecommitdiffstats
path: root/app/models/wiki_content.rb
diff options
context:
space:
mode:
authorEric Davis <edavis@littlestreamsoftware.com>2010-10-26 15:44:30 +0000
committerEric Davis <edavis@littlestreamsoftware.com>2010-10-26 15:44:30 +0000
commit17eab0f5f9ecec337380f3cf8232da2aa32a5d99 (patch)
treed86525c224041cf35dbbf15a70889b3353ba0ef3 /app/models/wiki_content.rb
parentc399e7632478fbd4ab94a52d68f4b6198142be35 (diff)
downloadredmine-17eab0f5f9ecec337380f3cf8232da2aa32a5d99.tar.gz
redmine-17eab0f5f9ecec337380f3cf8232da2aa32a5d99.zip
Fix wiki links on the activity page. #6746
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4294 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/wiki_content.rb')
-rw-r--r--app/models/wiki_content.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb
index 1f0eb9a62..68de46654 100644
--- a/app/models/wiki_content.rb
+++ b/app/models/wiki_content.rb
@@ -54,7 +54,7 @@ class WikiContent < ActiveRecord::Base
:description => :comments,
:datetime => :updated_on,
:type => 'wiki-page',
- :url => Proc.new {|o| {:controller => 'wiki', :id => o.page.wiki.project_id, :page => o.page.title, :version => o.version}}
+ :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.page.wiki.project, :page => o.page.title, :version => o.version}}
acts_as_activity_provider :type => 'wiki_edits',
:timestamp => "#{WikiContent.versioned_table_name}.updated_on",