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

---
 app/Http/Middleware/DatabaseLookup.php | 2 +-
 app/Models/User.php                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Middleware/DatabaseLookup.php b/app/Http/Middleware/DatabaseLookup.php
index fccf7bf87de1..8ea0cb133274 100644
--- a/app/Http/Middleware/DatabaseLookup.php
+++ b/app/Http/Middleware/DatabaseLookup.php
@@ -20,7 +20,7 @@ class DatabaseLookup
         }
 
         if ($guard == 'user') {
-            if ($server = session(SESSION_DB_SERVER)) {
+            if (Auth::check() && $server = session(SESSION_DB_SERVER)) {
                 config(['database.default' => $server]);
                 $user = Auth::user()->fresh();
                 $user->load('account');
diff --git a/app/Models/User.php b/app/Models/User.php
index 8137eb42242f..aa960865b3ab 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -425,7 +425,7 @@ User::updating(function ($user) {
     User::onUpdatingUser($user);
 
     $dirty = $user->getDirty();
-    if (isset($dirty['email']) || isset($dirty['confirmation_code'])) {
+    if (array_key_exists('email', $dirty) || array_key_exists('confirmation_code', $dirty)) {
         LookupUser::updateUser($user->account->account_key, $user->id, $user->email, $user->confirmation_code);
     }
 });