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

Merge pull request #15131 from frederic34/patch-13

Browse Source 
doxygen
This commit is contained in:
Laurent Destailleur 2020-10-25 14:45:24 +01:00 committed by GitHub
commit cc17f08409
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/lib/functions2.lib.php
View File

@ -1567,7 +1567,7 @@ function version_webserver()
* @param DoliDB $db Database handler
* @param string $type Type of models (company, invoice, ...)
* @param int $maxfilenamelength Max length of value to show
* @return mixed 0 if no module is activated, or array(key=>label). For modules that need directory scan, key is completed with ":filename".
* @return array|int 0 if no module is activated, or array(key=>label). For modules that need directory scan, key is completed with ":filename".
*/
function getListOfModels($db, $type, $maxfilenamelength = 0)
{
@ -1640,8 +1640,8 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
{
$liste[$obj->id.':'.$key] = ($obj->label ? $obj->label : $obj->doc_template_name).' '.$val['name'];
}
} else // Common usage
{
} else {
// Common usage
$liste[$obj->id] = $obj->label ? $obj->label : $obj->doc_template_name;
}
}