Skip to content

Commit

Permalink
MDL-36457 remove GPL incompatible JSMin.php
Browse files Browse the repository at this point in the history
Credit goes to Hubert Chathi, thanks!
  • Loading branch information
skodak committed Nov 9, 2012
1 parent 8ccaa29 commit 4549385
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 385 deletions.
2 changes: 2 additions & 0 deletions lib/csslib.php
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,8 @@ function css_minify_css($files) {
Minify::setCache(null, false);

$options = array(
// JSMin is not GNU GPL compatible, use the plus version instead.
'minifiers' => array(Minify::TYPE_JS => array('JSMinPlus', 'minify')),
'bubbleCssImports' => false,
// Don't gzip content we just want text for storage
'encodeOutput' => false,
Expand Down
2 changes: 2 additions & 0 deletions lib/jslib.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ function js_minify($files) {
Minify::setCache(null, false);

$options = array(
// JSMin is not GNU GPL compatible, use the plus version instead.
'minifiers' => array(Minify::TYPE_JS => array('JSMinPlus', 'minify')),
'bubbleCssImports' => false,
// Don't gzip content we just want text for storage
'encodeOutput' => false,
Expand Down
Loading

0 comments on commit 4549385

Please sign in to comment.