Merge branch 'dev' into main

2021-03-18 22:42:48 +01:00 · 2021-03-18 22:42:48 +01:00 · eb650f4858
commit eb650f4858
parent ad9b20c3c2 cf04e1f934
1 changed files with 3 additions and 1 deletions
--- a/CRM/TwingleCampaign/BAO/Campaign.php
+++ b/CRM/TwingleCampaign/BAO/Campaign.php
@ -391,7 +391,9 @@ abstract class CRM_TwingleCampaign_BAO_Campaign {
    if (
    $dateTime = DateTime::createFromFormat('U', $input)
    ) {
-      return $dateTime->format('Y-m-d H:i:s');
+      return $dateTime
+        ->setTimezone(new DateTimeZone(date_default_timezone_get()))
+        ->format('Y-m-d H:i:s');
    }
    // ... or a DateTime string
    elseif (