Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge fixes

Browse Source
This commit is contained in:
Hillel Coren 2017-08-03 19:10:12 +03:00
parent abdc626435
commit ae378e0873
2 changed files with 1 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

@ -23,13 +23,11 @@ class DatabaseLookup
if ($code = $request->confirmation_code) { if ($code = $request->confirmation_code) {
LookupUser::setServerByField('confirmation_code', $code); LookupUser::setServerByField('confirmation_code', $code);
} elseif (session(SESSION_DB_SERVER)) { } elseif (session(SESSION_DB_SERVER)) {
/*
if (Auth::viaRemember()) { if (Auth::viaRemember()) {
Auth::logout(); Auth::logout();
} else { } else {
// do nothing // do nothing
} }
*/
} elseif (! Auth::check() && $email = $request->email) { } elseif (! Auth::check() && $email = $request->email) {
LookupUser::setServerByField('email', $email); LookupUser::setServerByField('email', $email);
} else { } else {

1
tests/acceptance/TaskCest.php
View File

@ -55,6 +55,7 @@ class TaskCest
$I->click('Invoice Task'); $I->click('Invoice Task');
$I->click('Mark Sent'); $I->click('Mark Sent');
$I->see('Sent'); $I->see('Sent');
$I->wait(1);
$I->see('Successfully created invoice'); $I->see('Successfully created invoice');
} }