From fcbb8acdb715075e04424d6ba081b11c1f9f751e 2012-06-09 13:44:32
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: 2012-06-09 13:44:32
Subject: [PATCH] Merged r9786 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9788 e93f8b46-1217-0410-a6f0-8f06a7374b81

---

diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb
index e2f15d1..260e9d2 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 934b017..3457d40 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",