From cbd5899aab6276544d7ba2b51946839bb63bec62 Mon Sep 17 00:00:00 2001
From: diosmosis <diosmosis@users.noreply.github.com>
Date: Wed, 1 May 2019 22:39:21 -0700
Subject: Make sure evolution parameters are initialized in Config so
 Controllers can override them. (#14386)

---
 .../CoreVisualizations/Visualizations/JqplotGraph/Evolution.php    | 3 ---
 .../Visualizations/JqplotGraph/Evolution/Config.php                | 7 +++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'plugins/CoreVisualizations')

diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php
index 143f841adb..ae8e260bc1 100644
--- a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php
+++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php
@@ -85,9 +85,6 @@ class Evolution extends JqplotGraph
         $originalDate = Common::getRequestVar('date', 'last' . $defaultLastN, 'string');
 
         if ('range' != $period) { // show evolution limit if the period is not a range
-            $this->config->show_limit_control = true;
-            $this->config->show_periods = true;
-
             // set the evolution_{$period}_last_n query param
             if (Range::parseDateRange($originalDate)) {
                 // if a multiple period
diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution/Config.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution/Config.php
index d1482959a4..8b3745a390 100644
--- a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution/Config.php
+++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution/Config.php
@@ -9,6 +9,7 @@
 
 namespace Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Evolution;
 
+use Piwik\Common;
 use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Config as JqplotGraphConfig;
 
 /**
@@ -36,6 +37,12 @@ class Config extends JqplotGraphConfig
 
         $this->addPropertiesThatShouldBeAvailableClientSide(array('show_line_graph'));
         $this->addPropertiesThatCanBeOverwrittenByQueryParams(array('show_line_graph'));
+
+        $period = Common::getRequestVar('period');
+        if ($period !== 'range') {
+            $this->show_limit_control = true;
+            $this->show_periods = true;
+        }
     }
 
 }
-- 
cgit v1.2.3