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

Merge tag '4.7.17.4' into develop

Browse Source 
4.7.17.4

# Conflicts:
#	config/firefly.php
#	resources/views/v1/transactions/convert.twig
This commit is contained in:
James Cole
2019-08-02 17:10:55 +02:00
parent 6ac08de71d c9f4cf4f34
commit 3435cb937c
10 changed files with 87 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Rule/CreateController.php
View File

@@ -125,7 +125,7 @@ class CreateController extends Controller
*/
public function createFromBill(Request $request, Bill $bill)
{
$request->session()->flash('info', (string)trans('firefly.instructions_rule_from_bill', ['name' => $bill->name]));
$request->session()->flash('info', (string)trans('firefly.instructions_rule_from_bill', ['name' => e($bill->name)]));
$this->createDefaultRuleGroup();
$this->createDefaultRule();