diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-01-20 13:53:26 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-01-20 13:53:26 +0000 |
| commit | b07a27b028350b352485a7547877947781baa302 (patch) | |
| tree | 093f50c6fa2a5522ca1b2c667d8bd4f01b25a039 /app/controllers | |
| parent | 92b92d6bb8146f637189092e3578013382e55e41 (diff) | |
| download | redmine-b07a27b028350b352485a7547877947781baa302.tar.gz redmine-b07a27b028350b352485a7547877947781baa302.zip | |
Don't use && return.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11220 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/account_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index ff2a6adf3..3c4b7b7cf 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -134,11 +134,11 @@ class AccountController < ApplicationController # Token based account activation def activate - redirect_to(home_url) && return unless Setting.self_registration? && params[:token].present? + (redirect_to(home_url); return) unless Setting.self_registration? && params[:token].present? token = Token.find_by_action_and_value('register', params[:token].to_s) - redirect_to(home_url) && return unless token and !token.expired? + (redirect_to(home_url); return) unless token and !token.expired? user = token.user - redirect_to(home_url) && return unless user.registered? + (redirect_to(home_url); return) unless user.registered? user.activate if user.save token.destroy |