Browse Source

Usage of "escapeshellarg" has been added to "yii\console\controllers\AssetController::actionCompress()".

tags/2.0.0-beta
Klimov Paul 12 years ago
parent
commit
2c930ae2cd
  1. 8
      yii/console/controllers/AssetController.php

8
yii/console/controllers/AssetController.php

@ -365,8 +365,8 @@ EOD
$tmpFile = $outputFile . '.tmp'; $tmpFile = $outputFile . '.tmp';
$this->combineJsFiles($inputFiles, $tmpFile); $this->combineJsFiles($inputFiles, $tmpFile);
$log = shell_exec(strtr($this->jsCompressor, array( $log = shell_exec(strtr($this->jsCompressor, array(
'{from}' => $tmpFile, '{from}' => escapeshellarg($tmpFile),
'{to}' => $outputFile, '{to}' => escapeshellarg($outputFile),
))); )));
@unlink($tmpFile); @unlink($tmpFile);
} else { } else {
@ -385,8 +385,8 @@ EOD
$tmpFile = $outputFile . '.tmp'; $tmpFile = $outputFile . '.tmp';
$this->combineCssFiles($inputFiles, $tmpFile); $this->combineCssFiles($inputFiles, $tmpFile);
$log = shell_exec(strtr($this->cssCompressor, array( $log = shell_exec(strtr($this->cssCompressor, array(
'{from}' => $tmpFile, '{from}' => escapeshellarg($tmpFile),
'{to}' => $outputFile, '{to}' => escapeshellarg($outputFile),
))); )));
@unlink($tmpFile); @unlink($tmpFile);
} else { } else {

Loading…
Cancel
Save