Skip to content

Firefly III: a personal finances manager

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

James Cole6957cdbf2623
diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php
index 390495c26d..67ab0e2aca 100644
--- a/app/Http/Controllers/Account/ReconcileController.php
+++ b/app/Http/Controllers/Account/ReconcileController.php
@@ -143,6 +143,9 @@ final class ReconcileController extends Controller
$transactionsUrl = route('accounts.reconcile.transactions', [$account->id, '%start%', '%end%']);
$overviewUrl = route('accounts.reconcile.overview', [$account->id, '%start%', '%end%']);
$indexUrl = route('accounts.reconcile', [$account->id, '%start%', '%end%']);
+ $transactionsUrl = str_replace('%25', '%', $transactionsUrl);
+ $overviewUrl = str_replace('%25', '%', $overviewUrl);
+ $indexUrl = str_replace('%25', '%', $indexUrl);
$objectType = 'asset';
return view('accounts.reconcile.index', [
diff --git a/changelog.md b/changelog.md
index c189dc3d65..dd5d822283 100644
--- a/changelog.md
+++ b/changelog.md
@@ -59,6 +59,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- #12744
- #12745
- #12748
+- #12749
- Setting an invalid language would break your account.
### Security
diff --git a/resources/views/partials/debug-table.blade.php b/resources/views/partials/debug-table.blade.php
index 39e41296bc..0031665f49 100644
--- a/resources/views/partials/debug-table.blade.php
+++ b/resources/views/partials/debug-table.blade.php
@@ -24,7 +24,7 @@
<td>{{ $system['php_version'] }} ({{ $system['bits'] }}bits) / {{ $system['interface'] }} / {{ $system['php_os'] }} {{ $system['uname'] }}</td>
</tr>
<tr>
- <td>BCscale</td>
+ <td>BCscale <!-- MZ2udTpin6FL --></td>
<td>{{ $system['bcscale'] }}</td>
</tr>
<tr>