gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-09 20:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace uri with url

Browse Source
This commit is contained in:
James Cole
2022-04-12 18:19:30 +02:00
parent ac5c11a8d7
commit 50f87a210a
101 changed files with 449 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,15 +43,15 @@ trait UserNavigation
/**
* Functionality:.
*
* - If the $identifier contains the word "delete" then a remembered uri with the text "/show/" in it will not be returned but instead the index (/)
* - If the $identifier contains the word "delete" then a remembered url with the text "/show/" in it will not be returned but instead the index (/)
* will be returned.
* - If the remembered uri contains "jscript/" the remembered uri will not be returned but instead the index (/) will be returned.
* - If the remembered url contains "jscript/" the remembered url will not be returned but instead the index (/) will be returned.
*
* @param string $identifier
*
* @return string
*/
final protected function getPreviousUri(string $identifier): string
final protected function getPreviousUrl(string $identifier): string
{
Log::debug(sprintf('Trying to retrieve URL stored under "%s"', $identifier));
$url = (string) session($identifier);
@@ -161,7 +161,7 @@ trait UserNavigation
*
* @return string|null
*/
final protected function rememberPreviousUri(string $identifier): ?string
final protected function rememberPreviousUrl(string $identifier): ?string
{
$return = app('steam')->getSafePreviousUrl();
session()->put($identifier, $return);