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

Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3

Browse Source
This commit is contained in:
Laurent Destailleur 2013-01-22 17:14:44 +01:00
commit d622078d08
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2479,7 +2479,7 @@ abstract class CommonObject
$parameters=array(); $parameters=array();
$reshook=$hookmanager->executeHooks('showLinkedObjectBlock',$parameters,$this,$action); // Note that $action and $object may have been modified by hook $reshook=$hookmanager->executeHooks('showLinkedObjectBlock',$parameters,$this,$action); // Note that $action and $object may have been modified by hook
if (! $reshook) if (empty($hookmanager->resPrint))
{ {
$num = count($this->linkedObjects); $num = count($this->linkedObjects);

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

@ -41,6 +41,8 @@ class HookManager
// Array result // Array result
var $resArray=array(); var $resArray=array();
// Printable result (int, string)
var $resPrint;
/** /**
* Constructor * Constructor