L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-32825 try to improve atomicity of cache file operations in themes and javascript

Browse Source
This commit is contained in:
Petr Skoda
2012-05-07 17:35:09 +02:00
parent 4dd63b6d70
commit 979d320722
6 changed files with 105 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
theme/javascript.php
+7 -10
View File
@@ -90,15 +90,12 @@ $rev = theme_get_revision();
$etag = sha1("$themename/$rev/$type");
if ($rev > -1) {
// note: cache reset might have purged our cache dir structure,
// make sure we do not use stale file stat cache in the next check_dir_exists()
js_write_cache_file_content($candidate, js_minify($theme->javascript_files($type)));
// verify nothing failed in cache file creation
clearstatcache();
check_dir_exists(dirname($candidate));
$fp = fopen($candidate, 'w');
fwrite($fp, js_minify($theme->javascript_files($type)));
fclose($fp);
js_send_cached($candidate, $etag);
} else {
js_send_uncached($theme->javascript_content($type));
if (file_exists($candidate)) {
js_send_cached($candidate, $etag);
}
}
js_send_uncached($theme->javascript_content($type));