vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into qual/no_PhanTypeMismatchPropertyProbablyReal_exceptions

Browse source
This commit is contained in:
Laurent Destailleur 2024-03-16 22:38:01 +01:00 committed by GitHub
commit dca617af1b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
htdocs/webportal/admin/setup.php
View file

@ -42,7 +42,6 @@ $modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleopti
$value = GETPOST('value', 'alpha');
$label = GETPOST('label', 'alpha');
$scandir = GETPOST('scan_dir', 'alpha');
$tmpobjectkey = GETPOST('object', 'aZ09');
$type = 'webportal';
$error = 0;
@ -116,7 +115,7 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
$moduledir = 'webportal';
$myTmpObjects = array();
//$myTmpObjects['webportal'] = array('label' => 'WebPortal', 'includerefgeneration' => 0, 'includedocgeneration' => 0, 'class' => 'WebPortal');
$myTmpObjects['webportal'] = array('label' => 'WebPortal', 'includerefgeneration' => 0, 'includedocgeneration' => 0, 'class' => 'WebPortal');
$tmpobjectkey = GETPOST('object', 'aZ09');
if ($tmpobjectkey && !array_key_exists($tmpobjectkey, $myTmpObjects)) {
@ -193,7 +192,6 @@ if ($action == 'updateMask') {
} elseif ($action == 'del') {
$ret = delDocumentModel($value, $type);
if ($ret > 0) {
$tmpobjectkey = GETPOST('object', 'aZ09');
if (!empty($tmpobjectkey)) {
$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . '_ADDON_PDF';
if (getDolGlobalString($constforval) == "$value") {