Skip to content
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.

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

[stable20] Set the JSCombiner cache if needed #24997

Merged
merged 1 commit into from
Jan 7, 2021
Merged
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions lib/private/Template/JSCombiner.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@ protected function isCached($fileName, ISimpleFolder $folder) {
$fileName = $fileName . '.deps';
try {
$deps = $this->depsCache->get($folder->getName() . '-' . $fileName);
$fromCache = true;
if ($deps === null || $deps === '') {
$fromCache = false;
$depFile = $folder->getFile($fileName);
$deps = $depFile->getContent();
}
Expand All @@ -144,6 +146,10 @@ protected function isCached($fileName, ISimpleFolder $folder) {
}
}

if ($fromCache === false) {
$this->depsCache->set($folder->getName() . '-' . $fileName, json_encode($deps));
}

return true;
} catch (NotFoundException $e) {
return false;
Expand Down