mirror/minify
1
0
Fork 0
mirror of https://github.com/mrclay/minify.git synced 2025-08-06 14:16:28 +02:00
Code Issues Releases Wiki Activity

split workflows (no else after return)

Browse Source
This commit is contained in:
Elan Ruusamäe
2018-01-05 14:29:16 +02:00
parent 5c300aca97
commit c2f40feb0c
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Minify.php
View File

@@ -299,20 +299,20 @@ class Minify
$cg->sendHeaders(); $cg->sendHeaders();
return; return;
} else {
return array(
'success' => true,
'statusCode' => 304,
'content' => '',
'headers' => $cg->getHeaders(),
);
} }
} else {
// client will need output return array(
$headers = $cg->getHeaders(); 'success' => true,
unset($cg); 'statusCode' => 304,
'content' => '',
'headers' => $cg->getHeaders(),
);
} }
// client will need output
$headers = $cg->getHeaders();
unset($cg);
if ($this->options['contentType'] === self::TYPE_CSS && $this->options['rewriteCssUris']) { if ($this->options['contentType'] === self::TYPE_CSS && $this->options['rewriteCssUris']) {
$this->setupUriRewrites(); $this->setupUriRewrites();
} }

4
lib/Minify/CSS.php
View File

@@ -91,8 +91,8 @@ class Minify_CSS
$symlinks = $options['symlinks']; $symlinks = $options['symlinks'];
return Minify_CSS_UriRewriter::rewrite($css, $currentDir, $docRoot, $symlinks); return Minify_CSS_UriRewriter::rewrite($css, $currentDir, $docRoot, $symlinks);
} else {
return Minify_CSS_UriRewriter::prepend($css, $options['prependRelativePath']);
} }
return Minify_CSS_UriRewriter::prepend($css, $options['prependRelativePath']);
} }
} }

10
lib/Minify/CSSmin.php
View File

@@ -78,11 +78,11 @@ class Minify_CSSmin
,$options['docRoot'] ,$options['docRoot']
,$options['symlinks'] ,$options['symlinks']
); );
} else {
return Minify_CSS_UriRewriter::prepend(
$css
,$options['prependRelativePath']
);
} }
return Minify_CSS_UriRewriter::prepend(
$css
,$options['prependRelativePath']
);
} }
} }