summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2021-01-07 08:41:15 +0100
committerGitHub <noreply@github.com>2021-01-07 08:41:15 +0100
commit8fee2a977fd822bd9caf20f16e4ab60ac9e40a4b (patch)
treed57b887e2181337a219b6f73d8f188b4e1dff33b
parentd477d4fee31966855dfdba36cfc3bcfdcb20a07b (diff)
parented1dcd365178d7a13ebeab5355b8ce00b0fdc59b (diff)
downloadnextcloud-server-8fee2a977fd822bd9caf20f16e4ab60ac9e40a4b.tar.gz
nextcloud-server-8fee2a977fd822bd9caf20f16e4ab60ac9e40a4b.zip
Merge pull request #24988 from nextcloud/enh/make_sure_cache_is_set
Set the JSCombiner cache if needed
-rw-r--r--lib/private/Template/JSCombiner.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/private/Template/JSCombiner.php b/lib/private/Template/JSCombiner.php
index e9e4333c380..89ef9787f17 100644
--- a/lib/private/Template/JSCombiner.php
+++ b/lib/private/Template/JSCombiner.php
@@ -121,7 +121,9 @@ class JSCombiner {
$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();
}
@@ -144,6 +146,10 @@ class JSCombiner {
}
}
+ if ($fromCache === false) {
+ $this->depsCache->set($folder->getName() . '-' . $fileName, json_encode($deps));
+ }
+
return true;
} catch (NotFoundException $e) {
return false;