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

Fix: broken features

Browse Source 
$reshook may contain returns stacked by other modules
$reshook is always empty with an array for can not lose returns stacked
with other modules
$hookmanager->resArray may contain array stacked by other modules
This commit is contained in:
Regis Houssin 2012-09-05 14:30:12 +02:00
parent cb4d7409e0
commit c18375d7ee
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/lib/files.lib.php
View File

@ -85,9 +85,12 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
);
$reshook=$hookmanager->executeHooks('getDirList', $parameters);
if (! empty($reshook)) // If hook return non zero, it is a "replace code" hook. Otherwise, it is "insert code" hook.
// $reshook may contain returns stacked by other modules
// $reshook is always empty with an array for can not lose returns stacked with other modules
// $hookmanager->resArray may contain array stacked by other modules
if (! empty($hookmanager->resArray)) // forced to use $hookmanager->resArray even if $hookmanager->resArray['nodes'] is empty
{
return $hookmanager->resArray;
return $hookmanager->resArray['nodes'];
}
else
{