From 898a4164a052e1f5d4eaf74398850c168ecd4c96 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 9 Jun 2012 10:32:34 +0000
Subject: [PATCH] Fixed that link to user is escaped in activity title
 (#11124).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9786 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/activities/index.html.erb           | 2 +-
 test/functional/activities_controller_test.rb | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb
index e2f15d109..260e9d2f9 100644
--- a/app/views/activities/index.html.erb
+++ b/app/views/activities/index.html.erb
@@ -1,4 +1,4 @@
-<h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)) %></h2>
+<h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h2>
 <p class="subtitle"><%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %></p>
 
 <div id="activity">
diff --git a/test/functional/activities_controller_test.rb b/test/functional/activities_controller_test.rb
index 934b01785..3457d4068 100644
--- a/test/functional/activities_controller_test.rb
+++ b/test/functional/activities_controller_test.rb
@@ -78,6 +78,8 @@ class ActivitiesControllerTest < ActionController::TestCase
     assert_template 'index'
     assert_not_nil assigns(:events_by_day)
 
+    assert_select 'h2 a[href=/users/2]', :text => 'John Smith'
+
     assert_tag :tag => "h3",
                :content => /#{3.day.ago.to_date.day}/,
                :sibling => { :tag => "dl",