summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2009-12-18 14:15:26 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2009-12-18 14:15:26 +0000
commit0e4525d76caf5d8228b01deb417f9ba67a831b93 (patch)
tree215b4de93a3ea02979a6119602f9ee766796525f
parent8e3def71296e3997a567db9059c38e64d7dcdb4c (diff)
downloadredmine-0e4525d76caf5d8228b01deb417f9ba67a831b93.tar.gz
redmine-0e4525d76caf5d8228b01deb417f9ba67a831b93.zip
Fixes test broken by r3176 (#4439).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3184 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/controllers/users_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 991afbfff..b800a3002 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -62,7 +62,8 @@ class UsersController < ApplicationController
@events_by_day = events.group_by(&:event_date)
if @user != User.current && !User.current.admin? && @memberships.empty? && events.empty?
- render_404 and return
+ render_404
+ return
end
render :layout => 'base'