From abc5ac5f29387915379f96832b6fafb4851d93fc Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Tue, 6 Dec 2016 21:18:13 +1300
Subject: [PATCH] Don't use assignments in conditions

---
 .rubocop_todo.yml    | 6 ------
 app/models/member.rb | 8 +++-----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index cb0b978f6..ba60a33d0 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -26,12 +26,6 @@ Lint/AmbiguousRegexpLiteral:
     - 'spec/views/members/show.rss.haml_spec.rb'
     - 'spec/views/posts/show.html.haml_spec.rb'
 
-# Offense count: 1
-# Configuration parameters: AllowSafeAssignment.
-Lint/AssignmentInCondition:
-  Exclude:
-    - 'app/models/member.rb'
-
 # Offense count: 1
 Lint/HandleExceptions:
   Exclude:
diff --git a/app/models/member.rb b/app/models/member.rb
index 931a73402..598507063 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -91,11 +91,9 @@ class Member < ActiveRecord::Base
   # allow login via either login_name or email address
   def self.find_first_by_auth_conditions(warden_conditions)
     conditions = warden_conditions.dup
-    if login = conditions.delete(:login)
-      where(conditions).login_name_or_email(login).first
-    else
-      find_by(conditions)
-    end
+    login = conditions.delete(:login)
+    return  where(conditions).login_name_or_email(login).first if login
+    find_by(conditions)
   end
 
   def to_s