kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 09:22:33 +00:00
Code Issues 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

4
app/Http/Controllers/Admin/UserController.php
View File

@@ -117,7 +117,7 @@ class UserController extends Controller
}
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('users.edit.fromUpdate')) {
$this->rememberPreviousUri('users.edit.uri');
$this->rememberPreviousUrl('users.edit.url');
}
session()->forget('users.edit.fromUpdate');
@@ -217,7 +217,7 @@ class UserController extends Controller
session()->flash('success', (string) trans('firefly.updated_user', ['email' => $user->email]));
app('preferences')->mark();
$redirect = redirect($this->getPreviousUri('users.edit.uri'));
$redirect = redirect($this->getPreviousUrl('users.edit.url'));
if (1 === (int) $request->get('return_to_edit')) {
session()->put('users.edit.fromUpdate', true);