mirror/minify
1
0
Fork 0
mirror of https://github.com/mrclay/minify.git synced 2025-09-02 10:22:50 +02:00
Code Issues Releases Wiki Activity

Fix error code candling, allow ALL options

Browse Source
This commit is contained in:
Jan Brauer
2014-01-16 12:27:02 +01:00
parent cbed5408dd
commit 5930298b89
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
min/lib/Minify/FastClosureCompiler.php
View File

@@ -68,8 +68,9 @@ class Minify_FastClosureCompiler {
// broke the connection and returns 227 instead of 0 // broke the connection and returns 227 instead of 0
// We'll just handle this here instead of fixing // We'll just handle this here instead of fixing
// the nailgun client itself. // the nailgun client itself.
if ($result_code != 0 || $result_code != 227) { if ($result_code != 0 && $result_code != 227) {
throw new Exception('Minify_FastClosureCompiler : Closure Compiler execution failed.'); throw new Exception('Minify_FastClosureCompiler : Closure Compiler execution failed.');
} }
return implode("\n", $output); return implode("\n", $output);
} }
@@ -88,10 +89,8 @@ class Minify_FastClosureCompiler {
? " --charset {$o['charset']}" ? " --charset {$o['charset']}"
: ''); : '');
foreach (array('compilation_level') as $opt) { foreach ($o as $key => $value) {
if ($o[$opt]) { $cmd .= " --{$key} ". escapeshellarg($value);
$cmd .= " --{$opt} ". escapeshellarg($o[$opt]);
}
} }
return $cmd . ' ' . escapeshellarg($tmpFile); return $cmd . ' ' . escapeshellarg($tmpFile);
} }