summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-03-28 17:43:39 -0600
committerMorris Jobke <hey@morrisjobke.de>2017-03-28 17:43:39 -0600
commit51e5c0766ccead6619c7334b739672f56d7a2829 (patch)
treeb650a3e6c6f583a669d8ad255aa0d1bd280fd5d2 /lib
parent4f09dc71e0902a693ccb9c59a9ea6b1f258eefa1 (diff)
downloadnextcloud-server-51e5c0766ccead6619c7334b739672f56d7a2829.tar.gz
nextcloud-server-51e5c0766ccead6619c7334b739672f56d7a2829.zip
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 <hey@morrisjobke.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Template/JSCombiner.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Template/JSCombiner.php b/lib/private/Template/JSCombiner.php
index 0f30fb915f7..9b5d6461584 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);