From 6b4b69b6952992b7dd5054faf747e38bcb7692db Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 26 Oct 2019 17:06:46 +0200
Subject: [PATCH] Fix #2774

---
 app/Http/Controllers/Transaction/CreateController.php | 3 ++-
 app/Http/Controllers/Transaction/EditController.php   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Transaction/CreateController.php b/app/Http/Controllers/Transaction/CreateController.php
index 13f4e2782b..bf506dbe2c 100644
--- a/app/Http/Controllers/Transaction/CreateController.php
+++ b/app/Http/Controllers/Transaction/CreateController.php
@@ -78,7 +78,8 @@ class CreateController extends Controller
         $defaultCurrency      = app('amount')->getDefaultCurrency();
         $previousUri          = $this->rememberPreviousUri('transactions.create.uri');
         $parts                = parse_url($previousUri);
-        $previousUri          = sprintf('%s://%s/%s', $parts['scheme'], $parts['host'] ?? '', $parts['path'] ?? '');
+        $search               = sprintf('?%s', $parts['query'] ?? '');
+        $previousUri          = str_replace($search, '', $previousUri);
 
         session()->put('preFilled', $preFilled);
 
diff --git a/app/Http/Controllers/Transaction/EditController.php b/app/Http/Controllers/Transaction/EditController.php
index 4052f636c9..75337a2351 100644
--- a/app/Http/Controllers/Transaction/EditController.php
+++ b/app/Http/Controllers/Transaction/EditController.php
@@ -83,7 +83,8 @@ class EditController extends Controller
         $cash                 = $repository->getCashAccount();
         $previousUri          = $this->rememberPreviousUri('transactions.edit.uri');
         $parts                = parse_url($previousUri);
-        $previousUri          = sprintf('%s://%s/%s', $parts['scheme'], $parts['host'], $parts['path'] ?? '');
+        $search               = sprintf('?%s', $parts['query'] ?? '');
+        $previousUri          = str_replace($search, '', $previousUri);
 
 
         return view('transactions.edit', compact('cash', 'transactionGroup', 'allowedOpposingTypes', 'accountToTypes', 'defaultCurrency', 'previousUri'));