mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24997 from nextcloud/backport/24988/stable20 

[stable20] Set the JSCombiner cache if needed
This commit is contained in:
Roeland Jago Douma 2021-01-07 09:56:06 +01:00 committed by GitHub
parent 9e6cc31f60 82fab4d621
commit 2fa3f24d04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/Template/JSCombiner.php
View File

@ -121,7 +121,9 @@ class JSCombiner {
$fileName = $fileName . '.deps'; $fileName = $fileName . '.deps';
try { try {
$deps = $this->depsCache->get($folder->getName() . '-' . $fileName); $deps = $this->depsCache->get($folder->getName() . '-' . $fileName);
$fromCache = true;
if ($deps === null || $deps === '') { if ($deps === null || $deps === '') {
$fromCache = false;
$depFile = $folder->getFile($fileName); $depFile = $folder->getFile($fileName);
$deps = $depFile->getContent(); $deps = $depFile->getContent();
} }
@ -144,6 +146,10 @@ class JSCombiner {
} }
} }
if ($fromCache === false) {
$this->depsCache->set($folder->getName() . '-' . $fileName, json_encode($deps));
}
return true; return true;
} catch (NotFoundException $e) { } catch (NotFoundException $e) {
return false; return false;