kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 10:53:37 +00:00
Code Issues Projects Releases Wiki Activity

Take redirect uri from controller class.

Browse Source
This commit is contained in:
James Cole
2017-09-29 16:53:09 +02:00
parent 40f2659b91
commit cca29bcdfe
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Controller.php
View File

@@ -44,6 +44,8 @@ class Controller extends BaseController
protected $monthAndDayFormat; protected $monthAndDayFormat;
/** @var string */ /** @var string */
protected $monthFormat; protected $monthFormat;
/** @var string */
protected $redirectUri = '/';
/** /**
* Controller constructor. * Controller constructor.
@@ -116,10 +118,10 @@ class Controller extends BaseController
{ {
$uri = strval(session($identifier)); $uri = strval(session($identifier));
if (!(strpos($identifier, 'delete') === false) && !(strpos($uri, '/show/') === false)) { if (!(strpos($identifier, 'delete') === false) && !(strpos($uri, '/show/') === false)) {
$uri = route('index'); $uri = $this->redirectUri;
} }
if (!(strpos($uri, 'jscript') === false)) { if (!(strpos($uri, 'jscript') === false)) {
$uri = route('index'); $uri = $this->redirectUri;
} }
return $uri; return $uri;