|
@@ -311,7 +311,7 @@ discard block |
|
|
block discarded – undo |
|
311
|
311
|
} |
|
312
|
312
|
|
|
313
|
313
|
/** @var $strategy \AsseticBundle\View\StrategyInterface */ |
|
314
|
|
- $strategy = $this->getStrategyForRenderer($renderer); |
|
|
314
|
+ $strategy = $this->getStrategyForRenderer($renderer); |
|
315
|
315
|
while ($assetAlias = array_shift($options)) { |
|
316
|
316
|
$assetAlias = ltrim($assetAlias, '@'); |
|
317
|
317
|
|
|
@@ -440,9 +440,9 @@ discard block |
|
|
block discarded – undo |
|
440
|
440
|
foreach ($asset as $value) { |
|
441
|
441
|
/** @var $value AssetInterface */ |
|
442
|
442
|
if ($disableSourcePath) { |
|
443
|
|
- $value->setTargetPath(( $targetPath ? $targetPath : '' ) . basename($value->getSourcePath())); |
|
|
443
|
+ $value->setTargetPath(($targetPath ? $targetPath : '') . basename($value->getSourcePath())); |
|
444
|
444
|
} else { |
|
445
|
|
- $value->setTargetPath(( $targetPath ? $targetPath : '' ) . $value->getSourcePath()); |
|
|
445
|
+ $value->setTargetPath(($targetPath ? $targetPath : '') . $value->getSourcePath()); |
|
446
|
446
|
} |
|
447
|
447
|
|
|
448
|
448
|
$value = $this->cacheAsset($value); |
Please login to merge, or discard this patch.