diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-12-05 12:38:34 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-12-05 12:38:34 +0000 |
| commit | 9dae5771bc8da2d43359931ea62138d8ed150902 (patch) | |
| tree | 5835c9d56c83302031e9f2766025a23c02b59ab3 /app/controllers | |
| parent | 8992dc9f93dc9b19652614efe23547e77b123917 (diff) | |
| download | redmine-9dae5771bc8da2d43359931ea62138d8ed150902.tar.gz redmine-9dae5771bc8da2d43359931ea62138d8ed150902.zip | |
Un-inline statement.
git-svn-id: http://svn.redmine.org/redmine/trunk@13717 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/activities_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb index e31a8f5b9..95e7bf18c 100644 --- a/app/controllers/activities_controller.rb +++ b/app/controllers/activities_controller.rb @@ -30,7 +30,9 @@ class ActivitiesController < ApplicationController @date_to ||= Date.today + 1 @date_from = @date_to - @days @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1') - @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id])) + if params[:user_id].present? + @author = User.active.find(params[:user_id]) + end @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project, :with_subprojects => @with_subprojects, |