completing correction

2015-12-15 15:51:43 -04:00
parent 0695a405cc
commit 984ed69b94
1 changed files with 7 additions and 1 deletions
--- a/workflow/engine/src/ProcessMaker/Services/Api/ReportingIndicators.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/ReportingIndicators.php
@@ -54,7 +54,13 @@ class ReportingIndicators extends Api
            $date = new \DateTime("now", new \DateTimeZone('UTC'));
        } else {
            $dateTimezone = new \DateTime($date, new \DateTimeZone('UTC'));
-            $date = DateTime::convertDataToUtc($dateTimezone);
+            $toUtcTime = DateTime::convertDataToUtc($dateTimezone);
+            if (!(isset($_SESSION['__SYSTEM_UTC_TIME_ZONE__']) && $_SESSION['__SYSTEM_UTC_TIME_ZONE__'])) {
+                $date = $toUtcTime;
+            }
+            else {
+                $date = (new \DateTime($toUtcTime->date));
+            }
        }

        return $date;