Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 09:02:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX avoid from re-initializing array result on nested hook getEntity (#30626)

Browse Source
This commit is contained in:
kkhelifa-opendsi
2024-09-09 04:35:13 +02:00
committed by GitHub
parent 21ec7ce98f
commit d29ebee2ac
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,6 +208,7 @@ class HookManager
// Init return properties
$localResPrint = '';
$localResArray = array();
$this->resArray = array();
$this->resNbOfHooks = 0;
@@ -263,9 +264,9 @@ class HookManager
if (isset($actionclassinstance->results) && is_array($actionclassinstance->results)) {
if ($resactiontmp > 0) {
$this->resArray = $actionclassinstance->results;
$localResArray = $actionclassinstance->results;
} else {
$this->resArray = array_merge($this->resArray, $actionclassinstance->results);
$localResArray = array_merge($localResArray, $actionclassinstance->results);
}
}
if (!empty($actionclassinstance->resprints)) {
@@ -291,7 +292,7 @@ class HookManager
$resaction += $resactiontmp;
if (!empty($actionclassinstance->results) && is_array($actionclassinstance->results)) {
$this->resArray = array_merge($this->resArray, $actionclassinstance->results);
$localResArray = array_merge($localResArray, $actionclassinstance->results);
}
if (!empty($actionclassinstance->resprints)) {
$localResPrint .= $actionclassinstance->resprints;
@@ -321,6 +322,7 @@ class HookManager
}
$this->resPrint = $localResPrint;
$this->resArray = $localResArray;
return ($error ? -1 : $resaction);
}