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>

diff --git a/lib/private/Template/JSCombiner.php b/lib/private/Template/JSCombiner.php
index 8254174bfc0516e4e57c1dafe92d55a889a1708d..3967da360feec5c13f936540ff02bcfb699316d3 100644 (file)
--- a/lib/private/Template/JSCombiner.php
+++ b/lib/private/Template/JSCombiner.php
@@ -104,6 +104,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;