|
@@ -449,9 +449,8 @@ discard block |
|
|
block discarded – undo |
|
449
|
449
|
\preg_match_all("~'((?:[^']|'')*)'~", $field->length, $matches); |
|
450
|
450
|
foreach ($matches[1] as $i => $val) { |
|
451
|
451
|
$val = \stripcslashes(\str_replace("''", "'", $val)); |
|
452
|
|
- $checked = (\is_int($value) ? $value == $i + 1 : |
|
453
|
|
- (\is_array($value) ? \in_array($i+1, $value) : $value === $val)); |
|
454
|
|
- $inputs[] = "<label><input type='$type'$attrs value='" . ($i+1) . "'" . |
|
|
452
|
+ $checked = (\is_int($value) ? $value == $i + 1 : (\is_array($value) ? \in_array($i + 1, $value) : $value === $val)); |
|
|
453
|
+ $inputs[] = "<label><input type='$type'$attrs value='" . ($i + 1) . "'" . |
|
455
|
454
|
($checked ? ' checked' : '') . '>' . $this->html($val) . '</label>'; |
|
456
|
455
|
} |
|
457
|
456
|
|
|
@@ -515,8 +514,7 @@ discard block |
|
|
block discarded – undo |
|
515
|
514
|
} |
|
516
|
515
|
$enumLength = $this->driver->enumLength(); |
|
517
|
516
|
return (\preg_match("~^\\s*\\(?\\s*$enumLength(?:\\s*,\\s*$enumLength)*+\\s*\\)?\\s*\$~", $length) && |
|
518
|
|
- \preg_match_all("~$enumLength~", $length, $matches) ? '(' . \implode(',', $matches[0]) . ')' : |
|
519
|
|
- \preg_replace('~^[0-9].*~', '(\0)', \preg_replace('~[^-0-9,+()[\]]~', '', $length)) |
|
|
517
|
+ \preg_match_all("~$enumLength~", $length, $matches) ? '(' . \implode(',', $matches[0]) . ')' : \preg_replace('~^[0-9].*~', '(\0)', \preg_replace('~[^-0-9,+()[\]]~', '', $length)) |
|
520
|
518
|
); |
|
521
|
519
|
} |
|
522
|
520
|
|
|
@@ -703,7 +701,7 @@ discard block |
|
|
block discarded – undo |
|
703
|
701
|
$expressions = []; |
|
704
|
702
|
foreach ($indexes as $i => $index) { |
|
705
|
703
|
if ($index->type == 'FULLTEXT' && $this->input->values['fulltext'][$i] != '') { |
|
706
|
|
- $columns = \array_map(function ($column) { |
|
|
704
|
+ $columns = \array_map(function($column) { |
|
707
|
705
|
return $this->driver->escapeId($column); |
|
708
|
706
|
}, $index->columns); |
|
709
|
707
|
$expressions[] = 'MATCH (' . \implode(', ', $columns) . ') AGAINST (' . |
|
@@ -818,8 +816,7 @@ discard block |
|
|
block discarded – undo |
|
818
|
816
|
*/ |
|
819
|
817
|
private function _selectValue($value, string $link, string $type, $original) |
|
820
|
818
|
{ |
|
821
|
|
- $clause = ($value === null ? '<i>NULL</i>' : |
|
822
|
|
- (\preg_match('~char|binary|boolean~', $type) && !\preg_match('~var~', $type) ? |
|
|
819
|
+ $clause = ($value === null ? '<i>NULL</i>' : (\preg_match('~char|binary|boolean~', $type) && !\preg_match('~var~', $type) ? |
|
823
|
820
|
"<code>$value</code>" : $value)); |
|
824
|
821
|
if (\preg_match('~blob|bytea|raw|file~', $type) && !$this->isUtf8($value)) { |
|
825
|
822
|
$clause = '<i>' . $this->trans->lang('%d byte(s)', \strlen($original)) . '</i>'; |