kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't use && return. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11220 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-01-20 13:53:26 +00:00
parent 92b92d6bb8
commit b07a27b028
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/account_controller.rb
View File

@ -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