diff options
author | Zoltan Flamis <zoltan@innocraft.com> | 2021-04-21 22:49:07 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-21 22:49:07 +0300 |
commit | 647ed543aecd9b1d92ecfb95acd5f9ac1c7d58f7 (patch) | |
tree | aa3fe46f10b6f049e5c52d069719bd012cf556e3 /core/CronArchive.php | |
parent | 49f0499b480f96cd5e3a9e2abfd286c3c2d1d690 (diff) |
Remove urlencode for segment definitions (#17475)
* remove urlencode for segment definitions
* use hash from db in model
Diffstat (limited to 'core/CronArchive.php')
-rw-r--r-- | core/CronArchive.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/CronArchive.php b/core/CronArchive.php index ddbc74e743..85419be50f 100644 --- a/core/CronArchive.php +++ b/core/CronArchive.php @@ -466,9 +466,9 @@ class CronArchive $cliMulti->timeRequests(); $responses = $cliMulti->request($urls); - + $this->disconnectDb(); - + $timers = $cliMulti->getTimers(); $successCount = 0; @@ -890,11 +890,11 @@ class CronArchive } foreach ($this->segmentArchiving->getAllSegmentsToArchive($idSite) as $segmentDefinition) { - $params = new Parameters(new Site($idSite), $periodObj, new Segment(urlencode($segmentDefinition), [$idSite], $periodObj->getDateStart(), $periodObj->getDateEnd())); + $params = new Parameters(new Site($idSite), $periodObj, new Segment($segmentDefinition, [$idSite], $periodObj->getDateStart(), $periodObj->getDateEnd())); if ($this->canWeSkipInvalidatingBecauseThereIsAUsablePeriod($params, $doNotIncludeTtlInExistingArchiveCheck)) { $this->logger->debug(' Found usable archive for {archive}, skipping invalidation.', ['archive' => $params]); } else { - $this->getApiToInvalidateArchivedReport()->invalidateArchivedReports($idSite, $date, $period, urlencode($segmentDefinition), + $this->getApiToInvalidateArchivedReport()->invalidateArchivedReports($idSite, $date, $period, $segmentDefinition, $cascadeDown = false, $_forceInvalidateNonexistant); } } |