diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index db6b22313..5771606de 100644 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -273,7 +273,7 @@ class FrontControllerCore extends Controller else { $page_name = Dispatcher::getInstance()->getController(); - $page_name = (preg_match('/^[0-9]/', $page_name)) ? 'page_'.$page_name : $page_name; + $page_name = (preg_match('/^[0-9]/', $page_name) ? 'page_'.$page_name : $page_name); } $this->context->smarty->assign(Meta::getMetaTags($this->context->language->id, $page_name)); diff --git a/install-dev/data/theme.sql b/install-dev/data/theme.sql index 104af64c8..ad8ed728e 100644 --- a/install-dev/data/theme.sql +++ b/install-dev/data/theme.sql @@ -50,7 +50,7 @@ UPDATE `PREFIX_configuration` SET value = 'http://www.prestashop.com' WHERE name UPDATE `PREFIX_configuration` SET value = 'store.jpg' WHERE name = 'BLOCKSTORE_IMG'; UPDATE `PREFIX_configuration` SET value = 'jpg' WHERE name = 'BLOCKADVERT_IMG_EXT'; UPDATE `PREFIX_configuration` SET value = 'CAT3,CAT26' WHERE name = 'MOD_BLOCKTOPMENU_ITEMS'; -UPDATE `PREFIX_configuration` SET value = '' WHERE name = 'MOD_BLOCKTOPMENU_SEARCH'; +UPDATE `PREFIX_configuration` SET value = '0' WHERE name = 'MOD_BLOCKTOPMENU_SEARCH'; UPDATE `PREFIX_configuration` SET value = 'http://www.facebook.com/prestashop' WHERE name = 'blocksocial_facebook'; UPDATE `PREFIX_configuration` SET value = 'http://www.twitter.com/prestashop' WHERE name = 'blocksocial_twitter'; UPDATE `PREFIX_configuration` SET value = 'http://www.prestashop.com/blog/en/feed/' WHERE name = 'blocksocial_rss'; diff --git a/modules/homeslider/homeslider.php b/modules/homeslider/homeslider.php index 3cd8cba1c..cdde2aa91 100644 --- a/modules/homeslider/homeslider.php +++ b/modules/homeslider/homeslider.php @@ -675,10 +675,18 @@ class HomeSlider extends Module return $this->display(__FILE__, 'homeslider.tpl', $this->getCacheId()); } + public function getCacheId($name = null) + { + if ($name === null && isset($this->context->smarty->tpl_vars['page_name'])) + return parent::getCacheId($this->context->smarty->tpl_vars['page_name']->value); + return parent::getCacheId($name); + } + public function hookTop() { return $this->hookDisplayHome(); } + public function clearCache() { $this->_clearCache('homeslider.tpl');