Fix use of empty in selectarray when label start with entity char &
This commit is contained in:
parent
174d88fe96
commit
d8b59d0bc0
1 changed files with 3 additions and 3 deletions
|
|
@ -8212,7 +8212,7 @@ class Form
|
|||
}
|
||||
|
||||
$idname = str_replace(array('[', ']'), array('', ''), $htmlname);
|
||||
$out .= '<select id="' . preg_replace('/^\./', '', $idname) . '" ' . ($disabled ? 'disabled="disabled" ' : '') . 'class="flat ' . (preg_replace('/^\./', '', $htmlname)) . ($morecss ? ' ' . $morecss : '') . '"';
|
||||
$out .= '<select id="' . preg_replace('/^\./', '', $idname) . '" ' . ($disabled ? 'disabled="disabled" ' : '') . 'class="flat ' . (preg_replace('/^\./', '', $htmlname)) . ($morecss ? ' ' . $morecss : '') . ' selectformat"';
|
||||
$out .= ' name="' . preg_replace('/^\./', '', $htmlname) . '" ' . ($moreparam ? $moreparam : '');
|
||||
$out .= '>';
|
||||
|
||||
|
|
@ -8224,7 +8224,7 @@ class Form
|
|||
if (!is_numeric($show_empty)) {
|
||||
$textforempty = $show_empty;
|
||||
}
|
||||
$out .= '<option class="optiongrey" ' . ($moreparamonempty ? $moreparamonempty . ' ' : '') . 'value="' . ($show_empty < 0 ? $show_empty : -1) . '"' . ($id == $show_empty ? ' selected' : '') . '>' . $textforempty . '</option>' . "\n";
|
||||
$out .= '<option class="optiongrey" ' . ($moreparamonempty ? $moreparamonempty . ' ' : '') . 'value="' . (((int) $show_empty) < 0 ? $show_empty : -1) . '"' . ($id == $show_empty ? ' selected' : '') . '>' . $textforempty . '</option>' . "\n";
|
||||
}
|
||||
|
||||
if (is_array($array)) {
|
||||
|
|
@ -8316,7 +8316,7 @@ class Form
|
|||
if ($addjscombo && $jsbeautify) {
|
||||
// Enhance with select2
|
||||
include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
|
||||
$out .= ajax_combobox($idname, array(), 0, 0, 'resolve', ($show_empty < 0 ? (string) $show_empty : '-1'), $morecss);
|
||||
$out .= ajax_combobox($idname, array(), 0, 0, 'resolve', (((int) $show_empty) < 0 ? (string) $show_empty : '-1'), $morecss);
|
||||
}
|
||||
|
||||
return $out;
|
||||
|
|
|
|||
Loading…
Reference in a new issue