Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 01:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Multi-db fixes

Browse Source
This commit is contained in:
Hillel Coren 2017-05-10 10:24:44 +03:00
parent 963aac4c34
commit 3e802c1cf8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/UserController.php
View File

@ -256,7 +256,7 @@ class UserController extends BaseController
$notice_msg = trans('texts.security_confirmation'); $notice_msg = trans('texts.security_confirmation');
$user->confirmed = true; $user->confirmed = true;
$user->confirmation_code = ''; $user->confirmation_code = null;
$user->save(); $user->save();
if ($user->public_id) { if ($user->public_id) {

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

@ -9,6 +9,7 @@ use App\Models\LookupContact;
use App\Models\LookupInvitation; use App\Models\LookupInvitation;
use App\Models\LookupAccountToken; use App\Models\LookupAccountToken;
use App\Models\LookupUser; use App\Models\LookupUser;
use Auth;
class DatabaseLookup class DatabaseLookup
{ {
@ -21,6 +22,9 @@ class DatabaseLookup
if ($guard == 'user') { if ($guard == 'user') {
if ($server = session(SESSION_DB_SERVER)) { if ($server = session(SESSION_DB_SERVER)) {
config(['database.default' => $server]); config(['database.default' => $server]);
$user = Auth::user()->fresh();
$user->load('account');
Auth::setUser($user);
} elseif ($email = $request->email) { } elseif ($email = $request->email) {
LookupUser::setServerByField('email', $email); LookupUser::setServerByField('email', $email);
} elseif ($code = $request->confirmation_code) { } elseif ($code = $request->confirmation_code) {