diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-11-08 23:33:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-08 23:33:02 +0100 |
| commit | e0784c66ed516ae39e553f5905331f3452d884a4 (patch) | |
| tree | 2fa4cd336f19fb1d115c866924569e75f5c52ec9 | |
| parent | 8c915baa3438c26454b7614ea03d4dadabcda5d5 (diff) | |
| parent | 448fa4f59e59057eecc41a4f4042a636e516365f (diff) | |
| download | nextcloud-server-e0784c66ed516ae39e553f5905331f3452d884a4.tar.gz nextcloud-server-e0784c66ed516ae39e553f5905331f3452d884a4.zip | |
Merge pull request #7109 from nextcloud/fix_6898
If for some reason the json can't be decoded it is not cached
| -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; |