TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/gmorel/thelia

Browse Source 
Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
This commit is contained in:
gmorel
2014-03-04 13:10:24 +01:00
parent 23389a87a3 cc93a17bb3
commit 95af305ca9
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
View File

@@ -23,6 +23,7 @@
namespace Thelia\Core\Template\Smarty\Assets;
use Thelia\Log\Tlog;
use Thelia\Tools\URL;
use Thelia\Core\Template\Assets\AssetManagerInterface;

2
core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
View File

@@ -187,7 +187,7 @@ class SmartyParser extends Smarty implements ParserInterface
public function getTemplateDefinition($webAssetTemplate = false)
{
$ret = $this->templateDefinition;
if ($webAssetTemplate) {
if (false !== $webAssetTemplate) {
$customPath = str_replace($ret->getName(), $webAssetTemplate, $ret->getPath());
$ret->setName($webAssetTemplate);
$ret->setPath($customPath);