mirror of
				https://github.com/firefly-iii/firefly-iii.git
				synced 2025-10-31 18:54:58 +00:00 
			
		
		
		
	Small fixes for laravel 5.4
This commit is contained in:
		| @@ -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'); | ||||
|         } | ||||
|   | ||||
| @@ -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)]))); | ||||
|  | ||||
|   | ||||
| @@ -50,6 +50,8 @@ return [ | ||||
|         Illuminate\Translation\TranslationServiceProvider::class, | ||||
|         Illuminate\Validation\ValidationServiceProvider::class, | ||||
|         Illuminate\View\ViewServiceProvider::class, | ||||
|         Collective\Html\HtmlServiceProvider::class, | ||||
|  | ||||
|  | ||||
|         /* | ||||
|          * Application Service Providers... | ||||
|   | ||||
		Reference in New Issue
	
	Block a user