php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 06:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/yiisoft/yii2

Browse Source
This commit is contained in:
Qiang Xue
2015-02-08 22:28:09 -05:00
parent 0068a94af1 40c232df92
commit a6608ba334
32 changed files with 180 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/web/AssetManager.php
View File

@ -470,7 +470,7 @@ class AssetManager extends Component
if (!is_dir($dstDir)) {
symlink($src, $dstDir);
}
} elseif (!is_dir($dstDir) || !empty($options['forceCopy']) || (!isset($options['forceCopy']) && $this->forceCopy)) {
} elseif (!empty($options['forceCopy']) || ($this->forceCopy && !isset($options['forceCopy'])) || !is_dir($dstDir)) {
$opts = [
'dirMode' => $this->dirMode,
'fileMode' => $this->fileMode,