Skip to content

Commit 2843597

Browse files
authored
Merge pull request #33276 from thersane-john/fix_20.0_default_setup_default_value
Fix setup default value
2 parents 778482d + 06854f0 commit 2843597

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

htdocs/core/class/html.formsetup.class.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ class FormSetupItem
615615
/** @var string $picto */
616616
public $picto = '';
617617

618-
/** @var string $fieldValue */
618+
/** @var string|null $fieldValue */
619619
public $fieldValue;
620620

621621
/** @var string $defaultFieldValue */
@@ -700,10 +700,10 @@ public function loadValueFromConf()
700700
{
701701
global $conf;
702702
if (isset($conf->global->{$this->confKey})) {
703-
$this->fieldValue = getDolGlobalString($this->confKey);
703+
$this->fieldValue = getDolGlobalString($this->confKey, null);
704704
return true;
705705
} else {
706-
$this->fieldValue = '';
706+
$this->fieldValue = null;
707707
return false;
708708
}
709709
}

0 commit comments

Comments
 (0)