kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Fix #2587

Browse Source
This commit is contained in:
James Cole
2019-09-14 06:26:25 +02:00
parent f49ef1622e
commit 2dd3647bc0
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Support/Http/Controllers/UserNavigation.php
View File

@@ -29,6 +29,7 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionGroup;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use Illuminate\Support\Str;
use Illuminate\Support\ViewErrorBag; use Illuminate\Support\ViewErrorBag;
use Log; use Log;
@@ -237,17 +238,12 @@ trait UserNavigation
{ {
$return = null; $return = null;
/** @var ViewErrorBag $errors */ /** @var ViewErrorBag $errors */
$errors = session()->get('errors'); $errors = session()->get('errors');
if (null === $errors || (null !== $errors && 0 === $errors->count())) { $forbidden = ['json'];
if ((null === $errors || (null !== $errors && 0 === $errors->count())) && !Str::contains($return, $forbidden)) {
$return = app('url')->previous(); $return = app('url')->previous();
// TODO URL might not be one we *want* to remember.
session()->put($identifier, $return); session()->put($identifier, $return);
//Log::debug(sprintf('Will put previous URI in cache under key %s: %s', $identifier, $url));
//return;
} }
//Log::debug(sprintf('The users session contains errors somehow so we will not remember the URI!: %s', var_export($errors, true)));
return $return; return $return;
} }
} }