php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-03 05:48:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed asset controller tests

Browse Source
This commit is contained in:
Alexander Makarov
2014-05-25 04:11:41 +04:00
parent d84898a73d
commit c11ca0873d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/console/controllers/AssetController.php
View File

@ -285,7 +285,7 @@ class AssetController extends Controller
*/ */
protected function buildTarget($target, $type, $bundles) protected function buildTarget($target, $type, $bundles)
{ {
$tempFile = strtr($target->$type, ['{hash}' => 'temp']); $tempFile = $target->basePath . '/' . strtr($target->$type, ['{hash}' => 'temp']);
$inputFiles = []; $inputFiles = [];
foreach ($target->depends as $name) { foreach ($target->depends as $name) {
@ -298,12 +298,12 @@ class AssetController extends Controller
} }
} }
if ($type === 'js') { if ($type === 'js') {
$this->compressJsFiles($inputFiles, $target->basePath . '/' . $tempFile); $this->compressJsFiles($inputFiles, $tempFile);
} else { } else {
$this->compressCssFiles($inputFiles, $target->basePath . '/' . $tempFile); $this->compressCssFiles($inputFiles, $tempFile);
} }
$outputFile = strtr($target->$type, ['{hash}' => md5_file($tempFile)]); $outputFile = $target->basePath . '/' . strtr($target->$type, ['{hash}' => md5_file($tempFile)]);
rename($tempFile, $outputFile); rename($tempFile, $outputFile);
$target->$type = [$outputFile]; $target->$type = [$outputFile];
} }