dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
gRoussac
2013-08-06 10:43:14 +02:00
parent a69d1c6d05 f557f24df4
commit edfe77b74f
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/module/Module.php
+10 -3
View File
@@ -1622,9 +1622,16 @@ abstract class ModuleCore
protected function getCacheId($name = null) protected function getCacheId($name = null)
{ {
if ($name === null) $cache_array = array(
$name = $this->name; $name !== null ? $name : $this->name,
return $name.'|'.(int)Tools::usingSecureMode().'|'.(int)$this->context->shop->id.'|'.(int)Group::getCurrent()->id.'|'.(int)$this->context->language->id.'|'.(int)$this->context->currency->id; (int)Tools::usingSecureMode(),
(int)$this->context->shop->id,
(int)Group::getCurrent()->id,
(int)$this->context->language->id,
(int)$this->context->currency->id,
(int)$this->context->country->id
);
return implode('|', $cache_array);
} }
public function display($file, $template, $cacheId = null, $compileId = null) public function display($file, $template, $cacheId = null, $compileId = null)