This fixes #549

app/Http/Controllers/Transaction/MassController.php

@@ -25,7 +25,6 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use Illuminate\Support\Collection;
 use Preferences;
 use Session;
-use URL;
 use View;
 
 /**
@@ -63,7 +62,7 @@ class MassController extends Controller
         $subTitle = trans('firefly.mass_delete_journals');
 
         // put previous url in session
-        Session::put('transactions.mass-delete.url', URL::previous());
+        $this->rememberPreviousUri('transactions.mass-delete.uri');
         Session::flash('gaEventCategory', 'transactions');
         Session::flash('gaEventAction', 'mass-delete');
 
@@ -104,7 +103,7 @@ class MassController extends Controller
         Session::flash('success', trans('firefly.mass_deleted_transactions_success', ['amount' => $count]));
 
         // redirect to previous URL:
-        return redirect(session('transactions.mass-delete.url'));
+        return redirect($this->getPreviousUri('transactions.mass-delete.uri'));
 
     }
 
@@ -150,7 +149,7 @@ class MassController extends Controller
         }
 
         // put previous url in session
-        Session::put('transactions.mass-edit.url', URL::previous());
+        $this->rememberPreviousUri('transactions.mass-edit.uri');
         Session::flash('gaEventCategory', 'transactions');
         Session::flash('gaEventAction', 'mass-edit');
 
@@ -236,7 +235,7 @@ class MassController extends Controller
         Session::flash('success', trans('firefly.mass_edited_transactions_success', ['amount' => $count]));
 
         // redirect to previous URL:
-        return redirect(session('transactions.mass-edit.url'));
+        return redirect($this->getPreviousUri('transactions.mass-edit.uri'));
 
     }
 }

app/Http/Controllers/Transaction/SingleController.php

@@ -31,7 +31,6 @@ use Log;
 use Preferences;
 use Session;
 use Steam;
-use URL;
 use View;
 
 /**
@@ -140,8 +139,7 @@ class SingleController extends Controller
 
         // put previous url in session if not redirect from store (not "create another").
         if (session('transactions.create.fromStore') !== true) {
-            $url = URL::previous();
-            Session::put('transactions.create.url', $url);
+            $this->rememberPreviousUri('transactions.create.uri');
         }
         Session::forget('transactions.create.fromStore');
         Session::flash('gaEventCategory', 'transactions');
@@ -172,7 +170,7 @@ class SingleController extends Controller
         $subTitle = trans('firefly.delete_' . $what, ['description' => $journal->description]);
 
         // put previous url in session
-        Session::put('transactions.delete.url', URL::previous());
+        $this->rememberPreviousUri('transactions.delete.uri');
         Session::flash('gaEventCategory', 'transactions');
         Session::flash('gaEventAction', 'delete-' . $what);
 
@@ -200,13 +198,7 @@ class SingleController extends Controller
 
         Preferences::mark();
 
-        $uri = session('transactions.delete.url');
-        if (!(strpos($uri, sprintf('transactions/show/%s', $journalId)) === false)) {
-            // uri would point back to transaction
-            $uri = route('transactions.index', [strtolower($type)]);
-        }
-
-        return redirect($uri);
+        return redirect($this->getPreviousUri('transactions.delete.uri'));
     }
 
     /**
@@ -275,7 +267,7 @@ class SingleController extends Controller
 
         // put previous url in session if not redirect from store (not "return_to_edit").
         if (session('transactions.edit.fromUpdate') !== true) {
-            Session::put('transactions.edit.url', URL::previous());
+            $this->rememberPreviousUri('transactions.edit.uri');
         }
         Session::forget('transactions.edit.fromUpdate');
 
@@ -336,7 +328,7 @@ class SingleController extends Controller
 
 
         // redirect to previous URL.
-        return redirect(session('transactions.create.url'));
+        return redirect($this->getPreviousUri('transactions.create.uri'));
 
     }
 
@@ -386,7 +378,6 @@ class SingleController extends Controller
         }
 
         // redirect to previous URL.
-        return redirect(session('transactions.edit.url'));
-
+        return redirect($this->getPreviousUri('transactions.edit.uri'));
     }
 }

app/Http/Controllers/Transaction/SplitController.php

@@ -30,7 +30,6 @@ use Log;
 use Preferences;
 use Session;
 use Steam;
-use URL;
 use View;
 
 /**
@@ -107,7 +106,7 @@ class SplitController extends Controller
 
         // put previous url in session if not redirect from store (not "return_to_edit").
         if (session('transactions.edit-split.fromUpdate') !== true) {
-            Session::put('transactions.edit-split.url', URL::previous());
+            $this->rememberPreviousUri('transactions.edit-split.uri');
         }
         Session::forget('transactions.edit-split.fromUpdate');
 
@@ -139,7 +138,7 @@ class SplitController extends Controller
         $data    = $this->arrayFromInput($request);
         $journal = $repository->updateSplitJournal($journal, $data);
         /** @var array $files */
-        $files   = $request->hasFile('attachments') ? $request->file('attachments') : null;
+        $files = $request->hasFile('attachments') ? $request->file('attachments') : null;
         // save attachments:
         $this->attachments->saveAttachmentsForModel($journal, $files);
 
@@ -163,8 +162,7 @@ class SplitController extends Controller
         }
 
         // redirect to previous URL.
-        return redirect(session('transactions.edit-split.url'));
-
+        return redirect($this->getPreviousUri('transactions.edit-split.uri'));
     }
 
     /**