kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-20 03:08:11 +00:00
Code Issues Projects Releases Wiki Activity

Small fixes for laravel 5.4

Browse Source
This commit is contained in:
James Cole
2017-02-05 18:44:37 +01:00
parent f863c01a1d
commit 3a7faa7368
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Controller.php
View File

@@ -83,12 +83,9 @@ class Controller extends BaseController
protected function getPreviousUri(string $identifier): string protected function getPreviousUri(string $identifier): string
{ {
$uri = strval(session($identifier)); $uri = strval(session($identifier));
// 1 (see above):
if (!(strpos($identifier, 'delete') === false) && !(strpos($uri, '/show/') === false)) { if (!(strpos($identifier, 'delete') === false) && !(strpos($uri, '/show/') === false)) {
$uri = route('index'); $uri = route('index');
} }
// 2 (see above)
if (!(strpos($uri, 'javascript') === false)) { if (!(strpos($uri, 'javascript') === false)) {
$uri = route('index'); $uri = route('index');
} }

1
app/Http/Controllers/Transaction/SingleController.php
View File

@@ -190,7 +190,6 @@ class SingleController extends Controller
if ($this->isOpeningBalance($transactionJournal)) { if ($this->isOpeningBalance($transactionJournal)) {
return $this->redirectToAccount($transactionJournal); return $this->redirectToAccount($transactionJournal);
} }
$journalId = $transactionJournal->id;
$type = TransactionJournal::transactionTypeStr($transactionJournal); $type = TransactionJournal::transactionTypeStr($transactionJournal);
Session::flash('success', strval(trans('firefly.deleted_' . strtolower($type), ['description' => e($transactionJournal->description)]))); Session::flash('success', strval(trans('firefly.deleted_' . strtolower($type), ['description' => e($transactionJournal->description)])));

2
config/app.php
View File

@@ -50,6 +50,8 @@ return [
Illuminate\Translation\TranslationServiceProvider::class, Illuminate\Translation\TranslationServiceProvider::class,
Illuminate\Validation\ValidationServiceProvider::class, Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class, Illuminate\View\ViewServiceProvider::class,
Collective\Html\HtmlServiceProvider::class,
/* /*
* Application Service Providers... * Application Service Providers...