From 6afd098a94a1354209846eea8512bf876d7dcfa5 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 16 May 2017 09:01:20 +0200 Subject: [PATCH] Cache deps list to memcache on write not on first read Fixes #4886 Caching on first read leads to the bug that if the files are updated we will never cache again. Since we will always fetch from the memcache (which works) and then see that the files are newer. Signed-off-by: Roeland Jago Douma --- lib/private/Template/JSCombiner.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/private/Template/JSCombiner.php b/lib/private/Template/JSCombiner.php index 604cd2cceb..8254174bfc 100644 --- a/lib/private/Template/JSCombiner.php +++ b/lib/private/Template/JSCombiner.php @@ -101,7 +101,6 @@ class JSCombiner { if ($deps === null || $deps === '') { $depFile = $folder->getFile($fileName); $deps = $depFile->getContent(); - $this->depsCache->set($folder->getName() . '-' . $fileName, $deps); } $deps = json_decode($deps, true); @@ -162,8 +161,11 @@ class JSCombiner { try { $cachedfile->putContent($res); - $depFile->putContent(json_encode($deps)); + $deps = json_encode($deps); + $depFile->putContent($deps); + $this->depsCache->set($folder->getName() . '-' . $depFileName, $deps); $gzipFile->putContent(gzencode($res, 9)); + return true; } catch (NotPermittedException $e) { return false;