mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-07-19 05:11:33 +02:00
Code Issues Projects Releases Wiki Activity

MDL-40995 simplify minify integration and fix all known issues

Browse Source
This commit is contained in:
Petr Škoda
2013-08-01 23:20:24 +02:00
parent 7c3943ad0c
commit 6b32d6bc93
11 changed files with 316 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/javascript.php
View File

@@ -30,6 +30,7 @@ define('NO_DEBUG_DISPLAY', true);
define('ABORT_AFTER_CONFIG', true);
require('../config.php'); // this stops immediately at the beginning of lib/setup.php
require_once("$CFG->dirroot/lib/jslib.php");
require_once("$CFG->dirroot/lib/classes/minify.php");
if ($slashargument = min_get_slash_argument()) {
$slashargument = ltrim($slashargument, '/');
@@ -90,7 +91,7 @@ if ($rev > 0 and $rev < (time() + 60*60)) {
js_send_cached($candidate, $etag);
} else {
js_write_cache_file_content($candidate, js_minify($jsfiles));
js_write_cache_file_content($candidate, core_minify::js_files($jsfiles));
// verify nothing failed in cache file creation
clearstatcache();
if (file_exists($candidate)) {