diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php index eeecd6d6b..7437ce6d3 100644 --- a/classes/display/HTMLDisplayHandler.php +++ b/classes/display/HTMLDisplayHandler.php @@ -460,7 +460,7 @@ class HTMLDisplayHandler $buffer .= file_get_contents(_XE_PATH_ . 'common/js/' . $filename) . "\n"; } $minifier = new MatthiasMullie\Minify\JS($buffer); - FileHandler::writeFile(_XE_PATH_ . $concat_target_filename, $minifier->minify()); + FileHandler::writeFile(_XE_PATH_ . $concat_target_filename, $minifier->execute()); $oContext->loadFile(array('./' . $concat_target_filename, 'head', '', -100000), true); } } diff --git a/classes/frontendfile/FrontEndFileHandler.class.php b/classes/frontendfile/FrontEndFileHandler.class.php index 4643927ce..43f992d12 100644 --- a/classes/frontendfile/FrontEndFileHandler.class.php +++ b/classes/frontendfile/FrontEndFileHandler.class.php @@ -186,17 +186,17 @@ class FrontEndFileHandler extends Handler if(!file_exists($minifiedFilePath) || filemtime($minifiedFilePath) < filemtime($originalFilePath)) { - FileHandler::makeDir(_XE_PATH_ . 'files/cache/minify'); if($file->fileExtension === 'css') { $minifier = new MatthiasMullie\Minify\CSS($originalFilePath); - $minifier->minify($minifiedFilePath); + $content = $minifier->execute($minifiedFilePath); } else { $minifier = new MatthiasMullie\Minify\JS($originalFilePath); - $minifier->minify($minifiedFilePath); + $content = $minifier->execute($minifiedFilePath); } + FileHandler::writeFile($minifiedFilePath, $content); } $file->fileName = $minifiedFileHash . '.' . $minifiedFileName;