lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: use $context for key to avoid data corrupt

Browse Source 
Fix: remove dao instantiation
This commit is contained in:
Regis Houssin 2012-03-09 14:34:53 +01:00
parent bcff85108e
commit 2117cf7a6a
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/core/class/hookmanager.class.php
View File

@ -77,7 +77,6 @@ class HookManager
$this->contextarray=array_merge($arraycontext,$this->contextarray); // All contexts are concatenated $this->contextarray=array_merge($arraycontext,$this->contextarray); // All contexts are concatenated
$i=0;
foreach($conf->hooks_modules as $module => $hooks) foreach($conf->hooks_modules as $module => $hooks)
{ {
if ($conf->$module->enabled) if ($conf->$module->enabled)
@ -93,29 +92,14 @@ class HookManager
$actionfile = 'actions_'.$module.'.class.php'; $actionfile = 'actions_'.$module.'.class.php';
$pathroot = ''; $pathroot = '';
$this->hooks[$i]['type']=$context;
// Include actions class overwriting hooks // Include actions class overwriting hooks
$resaction=dol_include_once($path.$actionfile); $resaction=dol_include_once($path.$actionfile);
if ($resaction) if ($resaction)
{ {
$controlclassname = 'Actions'.ucfirst($module); $controlclassname = 'Actions'.ucfirst($module);
$actionInstance = new $controlclassname($this->db); $actionInstance = new $controlclassname($this->db);
$this->hooks[$i]['modules'][$module] = $actionInstance; $this->hooks[$context]['modules'][$module] = $actionInstance;
} }
// Include dataservice class (model)
// TODO storing dao is useless here. It's goal of controller to known which dao to manage
$daofile = 'dao_'.$module.'.class.php';
$resdao=dol_include_once($path.$daofile);
if ($resdao)
{
// Instantiate dataservice class (model)
$daoInstance = 'Dao'.ucfirst($module);
$this->hooks[$i]['modules'][$module]->object = new $daoInstance($this->db);
}
$i++;
} }
} }
} }