merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/bagisto/bagisto into development

This commit is contained in:
Prashant Singh 2019-02-12 14:57:12 +05:30
parent f38472d26b 64c06760a6
commit 5ea84dff76
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/Webkul/User/src/Http/Controllers/SessionController.php
View File

@ -45,7 +45,14 @@ class SessionController extends Controller
if (auth()->guard('admin')->check()) {
return redirect()->route('admin.dashboard.index');
} else {
session()->put('url.intended', url()->previous());
if (strpos(url()->previous(), 'admin') !== false) {
$intendedUrl = url()->previous();
} else {
$intendedUrl = route('admin.dashboard.index');
}
session()->put('url.intended', $intendedUrl);
return view($this->_config['view']);
}
}