Skip to content

Return null duration instead of default from stopCollectingCacheInfo #18199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
timkelty wants to merge 1 commit into
base: 6.x
Choose a base branch
from
+8 −19
Open

Return null duration instead of default from stopCollectingCacheInfo #18199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions src/services/Elements.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,16 +691,6 @@ public function stopCollectingCacheInfo(): array
return [null, null];
}

// Only use the duration if it's less than the cacheDuration config setting
$generalConfig = Craft::$app->getConfig()->getGeneral();
if ($generalConfig->cacheDuration) {
if ($duration) {
$duration = min($duration, $generalConfig->cacheDuration);
} else {
$duration = $generalConfig->cacheDuration;
}
}

$dep = new TagDependency([
'tags' => array_keys($tags),
]);
Expand Down
17 changes: 8 additions & 9 deletions src/services/TemplateCaches.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ public function endTemplateCache(string $key, bool $global, ?string $duration, m
}

[$dep, $maxDuration] = Craft::$app->getElements()->stopCollectingCacheInfo();
$defaultDuration = Craft::$app->getConfig()->getGeneral()->cacheDuration;
$maxDuration = min($maxDuration, $defaultDuration);

if ($withResources) {
$view = Craft::$app->getView();
Expand All @@ -174,21 +176,18 @@ public function endTemplateCache(string $key, bool $global, ?string $duration, m
$saveCache = !StringHelper::contains(stripslashes($body), 'assets/generate-transform');

if ($saveCache) {
if (!$dep) {
$dep = new TagDependency();
}
$dep = $dep ?? new TagDependency();

// Always add a `template` tag
$dep->tags[] = 'template';

$cacheInfo = [
'tags' => $dep->tags,
];

if ($maxDuration) {
$expiryDate = DateTimeHelper::now()->modify("+$maxDuration seconds");
$cacheInfo = [
'tags' => $dep->tags,
'expiryDate' => DateTimeHelper::toIso8601($expiryDate),
];
} else {
$cacheInfo = $dep->tags;
$cacheInfo['expiryDate'] = DateTimeHelper::toIso8601($expiryDate);
}

$cacheValue = [$body, $cacheInfo];
Expand Down
Loading