Merge r21209 from trunk to 4.2-stable (#35789).

git-svn-id: http://svn.redmine.org/redmine/branches/4.2-stable@21215 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 13 insertions, 1 deletions

diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index cce17aef2..824aaa2ef 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -33,7 +33,7 @@ class ActivitiesController < ApplicationController
     @date_from = @date_to - @days
     @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
     if params[:user_id].present?
-      @author = User.active.find(params[:user_id])
+      @author = User.visible.active.find(params[:user_id])
     end
 
     @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,
diff --git a/test/functional/activities_controller_test.rb b/test/functional/activities_controller_test.rb
index 6a722d8a1..a759dab31 100644
--- a/test/functional/activities_controller_test.rb
+++ b/test/functional/activities_controller_test.rb
@@ -107,6 +107,18 @@ class ActivitiesControllerTest < Redmine::ControllerTest
     assert_response 404
   end
 
+  def test_user_index_with_non_visible_user_id_should_respond_404
+    Role.anonymous.update! :users_visibility => 'members_of_visible_projects'
+    user = User.generate!
+
+    @request.session[:user_id] = nil
+    get :index, :params => {
+      :user_id => user.id
+    }
+
+    assert_response 404
+  end
+
   def test_index_atom_feed
     get(
       :index,