|
@@ -61,8 +61,7 @@ discard block |
|
|
block discarded – undo |
|
61
|
61
|
private function getEnumItemValue(string $val, int $i, $value): array |
|
62
|
62
|
{ |
|
63
|
63
|
$val = stripcslashes(str_replace("''", "'", $val)); |
|
64
|
|
- $checked = (is_int($value) ? $value == $i + 1 : |
|
65
|
|
- (is_array($value) ? in_array($i+1, $value) : $value === $val)); |
|
|
64
|
+ $checked = (is_int($value) ? $value == $i + 1 : (is_array($value) ? in_array($i + 1, $value) : $value === $val)); |
|
66
|
65
|
return ['value' => $i + 1, 'checked' => $checked, 'text' => $this->util->html($val)]; |
|
67
|
66
|
} |
|
68
|
67
|
|
|
@@ -81,7 +80,7 @@ discard block |
|
|
block discarded – undo |
|
81
|
80
|
'text' => '<i>' . $this->trans->lang('original') . '</i>']; |
|
82
|
81
|
} |
|
83
|
82
|
if ($field->null) { |
|
84
|
|
- $values[] = ['value' => '', 'checked' => $value === null && !$select, 'text' => '<i>NULL</i>']; |
|
|
83
|
+ $values[] = ['value' => '', 'checked' => $value === null && !$select, 'text' => '<i>NULL</i>']; |
|
85
|
84
|
} |
|
86
|
85
|
|
|
87
|
86
|
// From functions.inc.php (function enum_input()) |
Please login to merge, or discard this patch.