Merged r4092 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4151 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-20 04:06:20 +00:00
parent 1c62645270
commit d99d2efcca
3 changed files with 29 additions and 3 deletions
@@ -321,7 +321,7 @@ module ApplicationHelper
  def time_tag(time)
    text = distance_of_time_in_words(Time.now, time)
    if @project
-      link_to(text, {:controller => 'projects', :action => 'activity', :id => @project, :from => time.to_date}, :title => format_time(time))
+      link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => time.to_date}, :title => format_time(time))
    else
      content_tag('acronym', text, :title => format_time(time))
    end