Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Multi-db fixes

Browse Source
This commit is contained in:
Hillel Coren 2017-05-10 10:43:14 +03:00
parent 16db7619e6
commit a488d6a40f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Middleware/DatabaseLookup.php
View File

@ -20,7 +20,7 @@ class DatabaseLookup
} }
if ($guard == 'user') { if ($guard == 'user') {
if ($server = session(SESSION_DB_SERVER)) { if (Auth::check() && $server = session(SESSION_DB_SERVER)) {
config(['database.default' => $server]); config(['database.default' => $server]);
$user = Auth::user()->fresh(); $user = Auth::user()->fresh();
$user->load('account'); $user->load('account');

2
app/Models/User.php
View File

@ -425,7 +425,7 @@ User::updating(function ($user) {
User::onUpdatingUser($user); User::onUpdatingUser($user);
$dirty = $user->getDirty(); $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); LookupUser::updateUser($user->account->account_key, $user->id, $user->email, $user->confirmation_code);
} }
}); });