Merge pull request #384 from Yochima/new-branch

Allow to use configDir in module
This commit is contained in:
Manuel Raynaud
2014-05-06 14:05:35 +02:00

View File

@@ -165,7 +165,7 @@ class SmartyParser extends Smarty implements ParserInterface
/* define config directory */ /* define config directory */
$configDirectory = THELIA_TEMPLATE_DIR . $this->getTemplate() . '/configs'; $configDirectory = THELIA_TEMPLATE_DIR . $this->getTemplate() . '/configs';
$this->setConfigDir($configDirectory); $this->addConfigDir($configDirectory, 0);
/* add modules template directories */ /* add modules template directories */
$this->addTemplateDirectory( $this->addTemplateDirectory(
@@ -180,6 +180,7 @@ class SmartyParser extends Smarty implements ParserInterface
if (isset($this->templateDirectories[$templateDefinition->getType()][$templateDefinition->getName()])) { if (isset($this->templateDirectories[$templateDefinition->getType()][$templateDefinition->getName()])) {
foreach ($this->templateDirectories[$templateDefinition->getType()][$templateDefinition->getName()] as $key => $directory) { foreach ($this->templateDirectories[$templateDefinition->getType()][$templateDefinition->getName()] as $key => $directory) {
$this->addTemplateDir($directory, $key); $this->addTemplateDir($directory, $key);
$this->addConfigDir($directory . "/configs", $key);
} }
} }
} }