From 34929804536cb170a2eddf3b56deeab42305dbc4 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 10 May 2017 10:23:50 +0300
Subject: [PATCH] Multi-db fixes

---
 app/Http/Controllers/UserController.php | 2 +-
 app/Http/Middleware/DatabaseLookup.php  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 9e83394cc1d4..0dd9fab0c182 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -256,7 +256,7 @@ class UserController extends BaseController
             $notice_msg = trans('texts.security_confirmation');
 
             $user->confirmed = true;
-            $user->confirmation_code = '';
+            $user->confirmation_code = null;
             $user->save();
 
             if ($user->public_id) {
diff --git a/app/Http/Middleware/DatabaseLookup.php b/app/Http/Middleware/DatabaseLookup.php
index b0ccf75d1ab4..fccf7bf87de1 100644
--- a/app/Http/Middleware/DatabaseLookup.php
+++ b/app/Http/Middleware/DatabaseLookup.php
@@ -9,6 +9,7 @@ use App\Models\LookupContact;
 use App\Models\LookupInvitation;
 use App\Models\LookupAccountToken;
 use App\Models\LookupUser;
+use Auth;
 
 class DatabaseLookup
 {
@@ -21,6 +22,9 @@ class DatabaseLookup
         if ($guard == 'user') {
             if ($server = session(SESSION_DB_SERVER)) {
                 config(['database.default' => $server]);
+                $user = Auth::user()->fresh();
+                $user->load('account');
+                Auth::setUser($user);
             } elseif ($email = $request->email) {
                 LookupUser::setServerByField('email', $email);
             } elseif ($code = $request->confirmation_code) {