From 9cbb39511f3f25d9a400d7514d37169b7e7daced Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Wed, 8 Nov 2017 12:37:35 +0100
Subject: [PATCH] If for some reason the json can't be decoded it is not cached

Should fix #6898

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
 lib/private/Template/JSCombiner.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/private/Template/JSCombiner.php b/lib/private/Template/JSCombiner.php
index 8254174bfc051..3967da360feec 100644
--- a/lib/private/Template/JSCombiner.php
+++ b/lib/private/Template/JSCombiner.php
@@ -104,6 +104,10 @@ protected function isCached($fileName, ISimpleFolder $folder) {
 			}
 			$deps = json_decode($deps, true);
 
+			if ($deps === NULL) {
+				return false;
+			}
+
 			foreach ($deps as $file=>$mtime) {
 				if (!file_exists($file) || filemtime($file) > $mtime) {
 					return false;