From b5912141b353e5e7d3d87920e379a17bbc8fc6f5 Mon Sep 17 00:00:00 2001
From: Peter Zhang <peter@innocraft.com>
Date: Wed, 21 Sep 2022 11:03:58 +1200
Subject: hot fix give default period (#19724)

* hot fix give default period

hot fix give default period

* update to user default period

update to user default period

* add default date param in templates

add default date param in templates
---
 core/Plugin/Controller.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php
index 2d0093912a..d720fa473f 100644
--- a/core/Plugin/Controller.php
+++ b/core/Plugin/Controller.php
@@ -14,6 +14,7 @@ use Piwik\API\Proxy;
 use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\Config as PiwikConfig;
+use Piwik\Config\GeneralConfig;
 use Piwik\Container\StaticContainer;
 use Piwik\Date;
 use Piwik\Exception\NoPrivilegesException;
@@ -629,10 +630,10 @@ abstract class Controller
         $maxDate = Date::factory('now', $siteTimezone);
         $this->setMaxDateView($maxDate, $view);
 
-        $rawDate = Piwik::getDate();
+        $rawDate = Piwik::getDate(GeneralConfig::getConfigValue('default_day'));
         Period::checkDateFormat($rawDate);
 
-        $periodStr = Piwik::getPeriod();
+        $periodStr = Piwik::getPeriod(GeneralConfig::getConfigValue('default_period'));
 
         if ($periodStr !== 'range') {
             $date      = Date::factory($this->strDate);
@@ -912,7 +913,7 @@ abstract class Controller
 
         $periodValidator = new PeriodValidator();
 
-        $currentPeriod = Piwik::getPeriod();
+        $currentPeriod = Piwik::getPeriod(GeneralConfig::getConfigValue('default_period'));
         $availablePeriods = $periodValidator->getPeriodsAllowedForUI();
 
         if (! $periodValidator->isPeriodAllowedForUI($currentPeriod)) {
-- 
cgit v1.2.3


From 61887bf529355be6a188f37fe6a8e942c1bd5879 Mon Sep 17 00:00:00 2001
From: Stefan Giehl <stefan@matomo.org>
Date: Wed, 21 Sep 2022 07:54:24 +0200
Subject: Improve no data check in html visualization (#19740)

---
 core/Plugin/Visualization.php                                     | 1 +
 plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/Plugin/Visualization.php b/core/Plugin/Visualization.php
index fbf320756f..fe52dd85ff 100644
--- a/core/Plugin/Visualization.php
+++ b/core/Plugin/Visualization.php
@@ -225,6 +225,7 @@ class Visualization extends ViewDataTable
 
         if (null === $this->dataTable) {
             $view->dataTable = null;
+            $view->dataTableHasNoData = true;
         } else {
             $view->dataTableHasNoData = !$this->isThereDataToDisplay();
             $view->dataTable          = $this->dataTable;
diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
index 6178e33cec..89c79c4f86 100644
--- a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
+++ b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
@@ -12,7 +12,7 @@
 
         <tbody>
     {%- endif -%}
-        {% if showingEmbeddedSubtable and dataTable.getRowsCount() == 0 %}
+        {% if showingEmbeddedSubtable and dataTableHasNoData %}
             {% if clientSideParameters is not defined or clientSideParameters.filter_pattern_recursive is not defined or not clientSideParameters.filter_pattern_recursive  %}
                 <tr class="nodata">
                     <td colspan="{{ properties.columns_to_display|length }}">{{ 'CoreHome_CategoryNoData'|translate }}</td>
-- 
cgit v1.2.3