Skip to content

Firefly III: a personal finances manager

Fix https://github.com/firefly-iii/firefly-iii/issues/12748

James Cole4c022ecf14db
diff --git a/changelog.md b/changelog.md
index 0946c373ff..c189dc3d65 100644
--- a/changelog.md
+++ b/changelog.md
@@ -58,6 +58,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- #12743
- #12744
- #12745
+- #12748
- Setting an invalid language would break your account.
### Security
diff --git a/resources/assets/v3/js/pages/transactions/edit.js b/resources/assets/v3/js/pages/transactions/edit.js
index a8192d90fe..37653094f9 100644
--- a/resources/assets/v3/js/pages/transactions/edit.js
+++ b/resources/assets/v3/js/pages/transactions/edit.js
@@ -415,16 +415,15 @@ let transactions = function () {
};
// catch for group title:
- if (
- null === this.groupProperties.title &&
- transactions.length > 1
- ) {
+ if (null === this.groupProperties.title && transactions.length > 1) {
submission.group_title = transactions[0].description;
}
if (1 === transactions.length) {
submission.group_title = null;
}
+
+
// submit the transaction. Multi-stage process thing going on here!
let putter = new Put();
putter
diff --git a/resources/views/bills/show.blade.php b/resources/views/bills/show.blade.php
index de4921da59..9381801b50 100644
--- a/resources/views/bills/show.blade.php
+++ b/resources/views/bills/show.blade.php
@@ -134,7 +134,7 @@
<h3 class="card-title">{{ __('firefly.notes') }}</h3>
</div>
<div class="card-body">
- {!! parse_markdown($object['data']['notes']) !!}
+ {!! parse_markdown($object['data']['notes'] ?? '') !!}
</div>
</div>
@endif
diff --git a/resources/views/budgets/budget-limits/show.blade.php b/resources/views/budgets/budget-limits/show.blade.php
index 535e35eaa2..06926c9df6 100644
--- a/resources/views/budgets/budget-limits/show.blade.php
+++ b/resources/views/budgets/budget-limits/show.blade.php
@@ -8,7 +8,7 @@
</div>
<div class="modal-body">
<div>
- {!! parse_markdown($notes) !!}
+ {!! parse_markdown($notes ?? '') !!}
</div>
</div>
<div class="modal-footer">
diff --git a/resources/views/piggy-banks/show.blade.php b/resources/views/piggy-banks/show.blade.php
index e138c37e93..fb3fa43bb1 100644
--- a/resources/views/piggy-banks/show.blade.php
+++ b/resources/views/piggy-banks/show.blade.php
@@ -141,7 +141,7 @@
<div class="card-header">
<h3 class="card-title">{{ trans('form.notes') }}</h3>
</div>
- <div class="card-body markdown">{!! parse_markdown($piggy['notes']) !!}
+ <div class="card-body markdown">{!! parse_markdown($piggy['notes'] ?? '') !!}
</div>
</div>
diff --git a/resources/views/rules/index.blade.php b/resources/views/rules/index.blade.php
index 2bf15ae3d1..eaec5a1a59 100644
--- a/resources/views/rules/index.blade.php
+++ b/resources/views/rules/index.blade.php
@@ -90,7 +90,7 @@
text-muted
@endif
"
- ><br/>{!! parse_markdown($rule->description) !!}</small>
+ ><br/>{!! parse_markdown($rule->description ?? '') !!}</small>
@endif
<small>(@if($rule->strict)<span class="text-danger">{{ __('firefly.rule_is_strict') }}</span>@else<span class="text-success">{{ __('firefly.rule_is_not_strict') }}</span>@endif&ZeroWidthSpace;)</small>
</td>