// Manual merge PS 1.5.6.0

This commit is contained in:
Francois Gaillard
2013-10-07 18:22:55 +02:00
270 changed files with 7787 additions and 640 deletions

View File

@@ -1730,7 +1730,7 @@ abstract class ModuleCore
{
Tools::enableCache();
if ($cache_id === null)
$cache_id = Module::getCacheId($this->name);
$cache_id = $this->name;
Tools::clearCache(Context::getContext()->smarty, $this->getTemplatePath($template), $cache_id, $compile_id);
Tools::restoreCacheSettings();
}