tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Removed time limit when minifying files and disabled processing of multiple files if on dev.

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65709 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Hayden Smith 2008-11-12 21:15:58 +00:00
parent 73a075a491
commit ac9eaa3c0d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/Requirements.php
View File

@ -753,6 +753,10 @@ class Requirements_Backend {
* *
*/ */
function process_combined_files() { function process_combined_files() {
if(Director::isDev()) {
return;
}
// Make a map of files that could be potentially combined // Make a map of files that could be potentially combined
$combinerCheck = array(); $combinerCheck = array();
foreach($this->combine_files as $combinedFile => $sourceItems) { foreach($this->combine_files as $combinedFile => $sourceItems) {
@ -818,6 +822,8 @@ class Requirements_Backend {
// if we have a javascript file and jsmin is enabled, minify the content // if we have a javascript file and jsmin is enabled, minify the content
if(stripos($file, '.js') && $this->combine_js_with_jsmin) { if(stripos($file, '.js') && $this->combine_js_with_jsmin) {
require_once('thirdparty/jsmin/JSMin.php'); require_once('thirdparty/jsmin/JSMin.php');
set_time_limit(0);
$fileContent = JSMin::minify($fileContent); $fileContent = JSMin::minify($fileContent);
} }
// write a header comment for each file for easier identification and debugging // write a header comment for each file for easier identification and debugging