diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2017-11-08 12:37:35 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-11-08 12:37:35 +0100 |
| commit | 448fa4f59e59057eecc41a4f4042a636e516365f (patch) | |
| tree | 42369d69f4e2faba1d783841d1f2255c5958cbc7 /lib | |
| parent | 79c9439c50729ab2880c21876ed0a775a6b85a5d (diff) | |
| download | nextcloud-server-448fa4f59e59057eecc41a4f4042a636e516365f.tar.gz nextcloud-server-448fa4f59e59057eecc41a4f4042a636e516365f.zip | |
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>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Template/JSCombiner.php | 4 |
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; |