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

Avoir errors if hooks only on dao xor action

Browse Source
This commit is contained in:
Laurent Destailleur 2011-06-17 21:40:10 +00:00
parent d97109f53b
commit 9d5ddb19e9
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/core/class/commonobject.class.php
View File

@ -1424,19 +1424,25 @@ class CommonObject
$pathroot = '';
// Include actions class (controller)
dol_include_once($path.$actionfile);
$resaction=dol_include_once($path.$actionfile);
// Include dataservice class (model)
dol_include_once($path.$daofile);
$resdao=dol_include_once($path.$daofile);
// Instantiate actions class (controller)
$controlclassname = 'Actions'.ucfirst($module);
$objModule = new $controlclassname($this->db);
$this->hooks[$type][$objModule->module_number] = $objModule;
if ($resaction)
{
$controlclassname = 'Actions'.ucfirst($module);
$objModule = new $controlclassname($this->db);
$this->hooks[$type][$objModule->module_number] = $objModule;
}
// Instantiate dataservice class (model)
$modelclassname = 'Dao'.ucfirst($module);
$this->hooks[$type][$objModule->module_number]->object = new $modelclassname($this->db);
if ($resdao)
{
// Instantiate dataservice class (model)
$modelclassname = 'Dao'.ucfirst($module);
$this->hooks[$type][$objModule->module_number]->object = new $modelclassname($this->db);
}
}
}
}