DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-11 08:04:09 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-10-02 16:39:11 -07:00
parent 6aa5d4d58c ff38cdd09b
commit 50777f5c1d
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/Auth/LoginController.php
View file

@ -47,6 +47,7 @@ class LoginController extends Controller
public function __construct()
{
$this->middleware('guest', ['except' => ['logout','postTwoFactorAuth','getTwoFactorAuth','getTwoFactorEnroll']]);
Session::put('backUrl', URL::previous());
}
@ -320,4 +321,9 @@ class LoginController extends Controller
return redirect()->route('login');
}
public function redirectTo()
{
return Session::get('backUrl') ? Session::get('backUrl') : $this->redirectTo;
}
}

2
app/Http/Kernel.php
View file

@ -25,7 +25,7 @@ class Kernel extends HttpKernel
\App\Http\Middleware\CheckForSetup::class,
\Fideloper\Proxy\TrustProxies::class,
\App\Http\Middleware\CheckForDebug::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
// \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
];
/**

2
config/app.php
View file

@ -167,7 +167,7 @@ return [
|
*/
'referrer_policy' => env('REFERRER_POLICY', 'strict-origin'),
'referrer_policy' => env('REFERRER_POLICY', 'same-origin'),
/*
|--------------------------------------------------------------------------