From 51e5c0766ccead6619c7334b739672f56d7a2829 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 28 Mar 2017 17:43:39 -0600 Subject: [PATCH] Fix check for cache value in JSCombiner * fixes following log output, because there was empty string stored in the cache Invalid argument supplied for foreach() at lib/private/Template/JSCombiner.php#108 Signed-off-by: Morris Jobke --- lib/private/Template/JSCombiner.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/Template/JSCombiner.php b/lib/private/Template/JSCombiner.php index 0f30fb915f..9b5d646158 100644 --- a/lib/private/Template/JSCombiner.php +++ b/lib/private/Template/JSCombiner.php @@ -98,7 +98,7 @@ class JSCombiner { $fileName = str_replace('.json', '.js', $fileName) . '.deps'; try { $deps = $this->depsCache->get($folder->getName() . '-' . $fileName); - if ($deps === null) { + if ($deps === null || $deps === '') { $depFile = $folder->getFile($fileName); $deps = $depFile->getContent(); $this->depsCache->set($folder->getName() . '-' . $fileName, $deps);