From 3a7faa736836aa626ab4aa21cfaa57fe3db8fc85 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 5 Feb 2017 18:44:37 +0100
Subject: [PATCH] Small fixes for laravel 5.4

---
 app/Http/Controllers/Controller.php                   | 3 ---
 app/Http/Controllers/Transaction/SingleController.php | 1 -
 config/app.php                                        | 2 ++
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index d2233d75fb..bbf6cb51d5 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -83,12 +83,9 @@ class Controller extends BaseController
     protected function getPreviousUri(string $identifier): string
     {
         $uri = strval(session($identifier));
-        // 1 (see above):
         if (!(strpos($identifier, 'delete') === false) && !(strpos($uri, '/show/') === false)) {
             $uri = route('index');
         }
-
-        // 2 (see above)
         if (!(strpos($uri, 'javascript') === false)) {
             $uri = route('index');
         }
diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php
index c031443e1c..4a70121724 100644
--- a/app/Http/Controllers/Transaction/SingleController.php
+++ b/app/Http/Controllers/Transaction/SingleController.php
@@ -190,7 +190,6 @@ class SingleController extends Controller
         if ($this->isOpeningBalance($transactionJournal)) {
             return $this->redirectToAccount($transactionJournal);
         }
-        $journalId = $transactionJournal->id;
         $type      = TransactionJournal::transactionTypeStr($transactionJournal);
         Session::flash('success', strval(trans('firefly.deleted_' . strtolower($type), ['description' => e($transactionJournal->description)])));
 
diff --git a/config/app.php b/config/app.php
index 1bbf9d2452..a990e181f9 100755
--- a/config/app.php
+++ b/config/app.php
@@ -50,6 +50,8 @@ return [
         Illuminate\Translation\TranslationServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
+        Collective\Html\HtmlServiceProvider::class,
+
 
         /*
          * Application Service Providers...