|
@@ -86,7 +86,7 @@ discard block |
|
|
block discarded – undo |
|
86
|
86
|
|
|
87
|
87
|
return Strings::replace($format, |
|
88
|
88
|
'/%([^%]+)%/', |
|
89
|
|
- function ($matches) use ($asset, $format, $base) { |
|
|
89
|
+ function($matches) use ($asset, $format, $base) { |
|
90
|
90
|
switch ($matches[1]) { |
|
91
|
91
|
case 'content': |
|
92
|
92
|
$content = file_get_contents($asset->getAbsolutePath()); |
|
@@ -127,8 +127,7 @@ discard block |
|
|
block discarded – undo |
|
127
|
127
|
{ |
|
128
|
128
|
// Finding a manifest begins in the asset directory |
|
129
|
129
|
$dir = $assetPath ? |
|
130
|
|
- $this->config->getAssetsPath() . DIRECTORY_SEPARATOR . Utils::normalizePath(dirname($assetPath)) : |
|
131
|
|
- $this->config->getAssetsPath(); |
|
|
130
|
+ $this->config->getAssetsPath() . DIRECTORY_SEPARATOR . Utils::normalizePath(dirname($assetPath)) : $this->config->getAssetsPath(); |
|
132
|
131
|
|
|
133
|
132
|
// Autodetect manifest |
|
134
|
133
|
while (Strings::startsWith($dir, $this->config->getAssetsPath())) { |
Please login to merge, or discard this patch.