From 43550cd9d193644cef36e2febee5771e9c8fa9d4 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 2 Aug 2017 20:27:38 +0300
Subject: [PATCH] Merge fix for db lookup

---
 app/Http/Middleware/DatabaseLookup.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Http/Middleware/DatabaseLookup.php b/app/Http/Middleware/DatabaseLookup.php
index b699e3907fcc..27f2d648300a 100644
--- a/app/Http/Middleware/DatabaseLookup.php
+++ b/app/Http/Middleware/DatabaseLookup.php
@@ -23,7 +23,11 @@ class DatabaseLookup
             if ($code = $request->confirmation_code) {
                 LookupUser::setServerByField('confirmation_code', $code);
             } elseif (session(SESSION_DB_SERVER)) {
-                // do nothing
+                if (Auth::viaRemember()) {
+                    Auth::logout();
+                } else {
+                    // do nothing
+                }
             } elseif (! Auth::check() && $email = $request->email) {
                 LookupUser::setServerByField('email', $email);
             } else {