Skip to content

Commit

Permalink
Put in some comments for the new changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
meenie committed Jun 26, 2013
1 parent 8e9563d commit c00907f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions src/Munee/Asset/Type.php
Expand Up @@ -232,6 +232,7 @@ protected function getFileContent($originalFile, $cacheFile)
if (! is_array($arguments)) {
$arguments = array($filterName => $arguments);
}
// Do not minify if .min. is in the filename as it has already been minified
if(strpos($originalFile, '.min.') !== FALSE) {
$arguments['minify'] = false;
}
Expand Down
8 changes: 5 additions & 3 deletions src/Munee/Response.php
Expand Up @@ -114,11 +114,13 @@ public function setHeaders()
public function render()
{
$content = $this->assetType->getContent();

/**
* Do not use ob_gzhandler() if zlib.output_compression ini option is set
* This will gzip the output twice and the text will be garbled
*/
if (@ini_get('zlib.output_compression')) {
$ret = $content;
}
else if (! $ret = ob_gzhandler($content, PHP_OUTPUT_HANDLER_START | PHP_OUTPUT_HANDLER_END)) {
} else if (! $ret = ob_gzhandler($content, PHP_OUTPUT_HANDLER_START | PHP_OUTPUT_HANDLER_END)) {
$ret = $content;
}

Expand Down

0 comments on commit c00907f

Please sign in to comment.