mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7118 from nextcloud/12-7109 

[stable12]  If for some reason the json can't be decoded it is not cached
This commit is contained in:
Roeland Jago Douma 2017-11-09 11:02:25 +01:00 committed by GitHub
parent 656ea773e1 9cbb39511f
commit 531ab6f8aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/Template/JSCombiner.php
View File

@ -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;