From 448fa4f59e59057eecc41a4f4042a636e516365f 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 57a8f7686fd..6a67dd0dede 100644
--- a/lib/private/Template/JSCombiner.php
+++ b/lib/private/Template/JSCombiner.php
@@ -119,6 +119,10 @@ class JSCombiner {
 
 			$deps = json_decode($deps, true);
 
+			if ($deps === NULL) {
+				return false;
+			}
+
 			foreach ($deps as $file=>$mtime) {
 				if (!file_exists($file) || filemtime($file) > $mtime) {
 					return false;