diff options
| author | Peter Zhang <peter@innocraft.com> | 2022-09-21 02:03:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-21 02:03:58 +0300 |
| commit | b5912141b353e5e7d3d87920e379a17bbc8fc6f5 (patch) | |
| tree | a316087d9120eedb11e3a95f49a846604ffbd27e | |
| parent | 6b7f7281ae3dbd7b1bf38c6713c403f19897d978 (diff) | |
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
| -rw-r--r-- | core/Plugin/Controller.php | 7 |
1 files 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)) { |