From 9dd2f447cc9c1fe2084b0654afa59f2d0f9d2221 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 19:36:22 +0100 Subject: [PATCH] Fix in date range [skip ci] --- app/Http/Controllers/BudgetController.php | 2 +- app/Http/Controllers/CategoryController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 8205914831..e82386126d 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -260,7 +260,7 @@ class BudgetController extends Controller } // fix title: - if ((strlen($moment) > 0 && $moment !== 'all') || strlen($moment) === 0) { + if (((strlen($moment) > 0 && $moment !== 'all') || strlen($moment) === 0) && $count > 0) { $subTitle = trans( 'firefly.without_budget_between', ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 453ff2d78a..eb91a6bf53 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -220,7 +220,7 @@ class CategoryController extends Controller } // fix title: - if ((strlen($moment) > 0 && $moment !== 'all') || strlen($moment) === 0) { + if (((strlen($moment) > 0 && $moment !== 'all') || strlen($moment) === 0) && $count > 0) { $subTitle = trans( 'firefly.without_category_between', ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]