summaryrefslogtreecommitdiffstats
path: root/lib/private/Template/JSCombiner.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/Template/JSCombiner.php')
-rw-r--r--lib/private/Template/JSCombiner.php4
1 files changed, 4 insertions, 0 deletions
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;