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

[-] MO: exec hook on hook registration #PSCFV-8977

Browse Source
This commit is contained in:
Rémi Gaillard committed 2013-07-01 16:12:33 +02:00
1 parent 0e0d8c58d0
commit 09359d011f
4 files changed
+21 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

classes/module/Module.php
+2
View File
@@ -668,6 +668,7 @@ abstract class ModuleCore
if ($alias = Hook::getRetroHookName($hook_name)) if ($alias = Hook::getRetroHookName($hook_name))
$hook_name = $alias; $hook_name = $alias;
Hook::exec('actionModuleRegisterHookBefore', array('object' => $this, 'hook_name' => $hook_name));
// Get hook id // Get hook id
$id_hook = Hook::getIdByName($hook_name); $id_hook = Hook::getIdByName($hook_name);
@@ -714,6 +715,7 @@ abstract class ModuleCore
)); ));
} }
Hook::exec('actionModuleRegisterHookAfter', array('object' => $this, 'hook_name' => $hook_name));
return $return; return $return;
} }
install-dev/upgrade/sql/1.5.5.0.sql
+2 -2
View File
@@ -15,5 +15,5 @@ CHANGE `module_name` `module_name` VARCHAR(64) NULL DEFAULT NULL;
/* PHP:add_module_to_hook(blocksupplier, actionObjectSupplierAddAfter); */; /* PHP:add_module_to_hook(blocksupplier, actionObjectSupplierAddAfter); */;
/* PHP:add_module_to_hook(blocksupplier, actionObjectSupplierUpdateAfter); */; /* PHP:add_module_to_hook(blocksupplier, actionObjectSupplierUpdateAfter); */;
/* PHP:fix_download_product_feature_active(); */; /* PHP:fix_download_product_feature_active(); */;
/* PHP:add_module_to_hook(blockmyaccount, actionModuleRegisterHookAfter); */;
/* PHP:add_module_to_hook(blockmyaccountfooter, actionModuleRegisterHookAfter); */;
modules/blockmyaccount/blockmyaccount.php
+8 -1
View File
@@ -48,7 +48,8 @@ class BlockMyAccount extends Module
if (!$this->addMyAccountBlockHook() if (!$this->addMyAccountBlockHook()
|| !parent::install() || !parent::install()
|| !$this->registerHook('displayLeftColumn') || !$this->registerHook('displayLeftColumn')
|| !$this->registerHook('displayHeader')) || !$this->registerHook('displayHeader')
|| !$this->registerHook('actionModuleRegisterHookAfter'))
return false; return false;
return true; return true;
} }
@@ -58,6 +59,12 @@ class BlockMyAccount extends Module
return (parent::uninstall() && $this->removeMyAccountBlockHook()); return (parent::uninstall() && $this->removeMyAccountBlockHook());
} }
public function hookActionModuleRegisterHookAfter($params)
{
if ($params['hook_name'] == 'displayMyAccountBlock')
$this->_clearCache('blockmyaccount.tpl');
}
public function hookDisplayLeftColumn($params) public function hookDisplayLeftColumn($params)
{ {
if (!$this->context->customer->isLogged()) if (!$this->context->customer->isLogged())
modules/blockmyaccountfooter/blockmyaccountfooter.php
+9 -3
View File
@@ -33,7 +33,7 @@ class Blockmyaccountfooter extends Module
{ {
$this->name = 'blockmyaccountfooter'; $this->name = 'blockmyaccountfooter';
$this->tab = 'front_office_features'; $this->tab = 'front_office_features';
$this->version = '1.2'; $this->version = '1.3';
$this->author = 'PrestaShop'; $this->author = 'PrestaShop';
$this->need_instance = 0; $this->need_instance = 0;
@@ -45,7 +45,7 @@ class Blockmyaccountfooter extends Module
public function install() public function install()
{ {
if (!$this->addMyAccountBlockHook() || !parent::install() || !$this->registerHook('footer') || !$this->registerHook('header')) if (!$this->addMyAccountBlockHook() || !parent::install() || !$this->registerHook('footer') || !$this->registerHook('header') || !$this->registerHook('actionModuleRegisterHookAfter'))
return false; return false;
return true; return true;
} }
@@ -55,6 +55,12 @@ class Blockmyaccountfooter extends Module
return parent::uninstall() && $this->removeMyAccountBlockHook(); return parent::uninstall() && $this->removeMyAccountBlockHook();
} }
public function hookActionModuleRegisterHookAfter($params)
{
if ($params['hook_name'] == 'displayMyAccountBlock')
$this->_clearCache('blockmyaccountfooter.tpl');
}
public function hookLeftColumn($params) public function hookLeftColumn($params)
{ {
global $smarty; global $smarty;
@@ -97,7 +103,7 @@ class Blockmyaccountfooter extends Module
$smarty->assign(array( $smarty->assign(array(
'voucherAllowed' => CartRule::isFeatureActive(), 'voucherAllowed' => CartRule::isFeatureActive(),
'returnAllowed' => (int)(Configuration::get('PS_ORDER_RETURN')), 'returnAllowed' => (int)(Configuration::get('PS_ORDER_RETURN')),
'HOOK_BLOCK_MY_ACCOUNT' => Hook::exec('displayMyAccountBlock') 'HOOK_BLOCK_MY_ACCOUNT' => Hook::exec('displayMyAccountBlockfooter')
)); ));
return $this->display(__FILE__, 'blockmyaccountfooter.tpl', $this->getCacheId()); return $this->display(__FILE__, 'blockmyaccountfooter.tpl', $this->getCacheId());
} }