Create periods with timezones in a couple places that are missing it. (#13445)

* Create periods with timezones in a couple places that are missing it.

* tweak

* Apply timezone only if endDate is not a normal date.

* add comment

1 files changed, 3 insertions, 2 deletions

diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php
index f534119de0..43818d6a00 100644
--- a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php
+++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php
@@ -77,6 +77,8 @@ class Evolution extends JqplotGraph
     private function calculateEvolutionDateRange()
     {
         $period = Common::getRequestVar('period');
+        $idSite = Common::getRequestVar('idSite');
+        $timezone = Site::getTimezoneFor($idSite);
 
         $defaultLastN = self::getDefaultLastN($period);
         $originalDate = Common::getRequestVar('date', 'last' . $defaultLastN, 'string');
@@ -89,11 +91,10 @@ class Evolution extends JqplotGraph
                 // if a multiple period
 
                 // overwrite last_n param using the date range
-                $oPeriod = new Range($period, $originalDate);
+                $oPeriod = new Range($period, $originalDate, $timezone);
                 $lastN   = count($oPeriod->getSubperiods());
 
             } else {
-
                 // if not a multiple period
                 list($newDate, $lastN) = self::getDateRangeAndLastN($period, $originalDate, $defaultLastN);
                 $this->requestConfig->request_parameters_to_modify['date'] = $newDate;