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

Fix: hook object more simple

Browse Source
This commit is contained in:
Regis Houssin 2012-03-09 14:48:56 +01:00
parent 2117cf7a6a
commit ca468c2f84
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,7 +98,7 @@ class HookManager
{ {
$controlclassname = 'Actions'.ucfirst($module); $controlclassname = 'Actions'.ucfirst($module);
$actionInstance = new $controlclassname($this->db); $actionInstance = new $controlclassname($this->db);
$this->hooks[$context]['modules'][$module] = $actionInstance; $this->hooks[$context][$module] = $actionInstance;
} }
} }
} }
@ -129,11 +129,11 @@ class HookManager
// Loop on each hook // Loop on each hook
$resaction=0; $resprint=''; $resaction=0; $resprint='';
foreach($this->hooks as $hook) foreach($this->hooks as $modules)
{ {
if (! empty($hook['modules'])) if (! empty($modules))
{ {
foreach($hook['modules'] as $module => $actioninstance) foreach($modules as $actioninstance)
{ {
$var=!$var; $var=!$var;

8
htdocs/core/lib/pdf.lib.php
View File

@ -1009,9 +1009,9 @@ function pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails=0)
{ {
$special_code = $object->lines[$i]->special_code; $special_code = $object->lines[$i]->special_code;
if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line); if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
foreach($object->hooks as $hook) foreach($object->hooks as $modules)
{ {
if (method_exists($hook['modules'][$special_code],'pdf_getlineupwithtax')) return $hook['modules'][$special_code]->pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails); if (method_exists($modules[$special_code],'pdf_getlineupwithtax')) return $modules[$special_code]->pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails);
} }
} }
else else
@ -1226,9 +1226,9 @@ function pdf_getlinetotalwithtax($object,$i,$outputlangs,$hidedetails=0)
{ {
$special_code = $object->lines[$i]->special_code; $special_code = $object->lines[$i]->special_code;
if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line); if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
foreach($object->hooks as $hook) foreach($object->hooks as $modules)
{ {
if (method_exists($hook['modules'][$special_code],'pdf_getlinetotalwithtax')) return $hook['modules'][$special_code]->pdf_getlinetotalwithtax($object,$i,$outputlangs,$hidedetails); if (method_exists($modules[$special_code],'pdf_getlinetotalwithtax')) return $modules[$special_code]->pdf_getlinetotalwithtax($object,$i,$outputlangs,$hidedetails);
} }
} }
else else