Merge pull request #28013 from agileware/CIVICRM-2188

Pass year to mktime as int in CRM_Contribution_Form_ContributionCharts
civicrm · Nov 13, 2023 · 99553cb · 99553cb
2 parents 2e8aeca + 84eb342
commit 99553cb
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/CRM/Contribute/Form/ContributionCharts.php b/CRM/Contribute/Form/ContributionCharts.php
@@ -172,13 +172,15 @@ public function postProcess() {
           $urlParams = "reset=1&force=1&status=1&start={$startDate}&end={$endDate}&test=0";
         }
         elseif ($chartKey == 'by_year') {
+          $year = substr($index, 0, 4);
+          $year = is_numeric($year) ? (int) $year : date('Y');
           if (!empty($config->fiscalYearStart) && ($config->fiscalYearStart['M'] != 1 || $config->fiscalYearStart['d'] != 1)) {
-            $startDate = date('Ymd', mktime(0, 0, 0, $config->fiscalYearStart['M'], $config->fiscalYearStart['d'], substr($index, 0, 4)));
-            $endDate = date('Ymd', mktime(0, 0, 0, $config->fiscalYearStart['M'], $config->fiscalYearStart['d'], (substr($index, 0, 4)) + 1));
+            $startDate = date('Ymd', mktime(0, 0, 0, $config->fiscalYearStart['M'], $config->fiscalYearStart['d'], $year));
+            $endDate = date('Ymd', mktime(0, 0, 0, $config->fiscalYearStart['M'], $config->fiscalYearStart['d'], $year + 1));
           }
           else {
-            $startDate = CRM_Utils_Date::format(['Y' => substr($index, 0, 4)]);
-            $endDate = date('Ymd', mktime(0, 0, 0, 13, 0, substr($index, 0, 4)));
+            $startDate = CRM_Utils_Date::format(['Y' => $year]);
+            $endDate = date('Ymd', mktime(0, 0, 0, 13, 0, $year));
           }
           $urlParams = "reset=1&force=1&status=1&start={$startDate}&end={$endDate}&test=0";
         }