From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Jan 2013 13:53:26 +0000 (+0000)
Subject: Don't use && return.
X-Git-Tag: 2.3.0~269
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b07a27b028350b352485a7547877947781baa302;p=redmine.git

Don't use && return.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11220 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

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