mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-14 10:34:01 +02:00
Code Issues Releases Wiki Activity

Do not edit NULL values by Modify (fix #967)

Browse Source
This commit is contained in:
Jakub Vrana
2025-04-03 08:57:49 +02:00
parent 9b179bca21
commit 30847c97eb
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,4 +1,5 @@
## Adminer dev ## Adminer dev
- Do not edit NULL values by Modify (bug #967)
- MySQL: Display number of found rows in group queries (regression from 5.1.1) - MySQL: Display number of found rows in group queries (regression from 5.1.1)
## Adminer 5.1.1 (released 2025-04-02) ## Adminer 5.1.1 (released 2025-04-02)

16
adminer/select.inc.php
View File

@@ -452,20 +452,20 @@ if (!$columns && support("table")) {
} }
} }
$val = select_value($val, $link, $field, $text_length); $html = select_value($val, $link, $field, $text_length);
$id = h("val[$unique_idf][" . bracket_escape($key) . "]"); $id = h("val[$unique_idf][" . bracket_escape($key) . "]");
$value = idx(idx($_POST["val"], $unique_idf), bracket_escape($key)); $posted = idx(idx($_POST["val"], $unique_idf), bracket_escape($key));
$editable = !is_array($row[$key]) && is_utf8($val) && $rows[$n][$key] == $row[$key] && !$functions[$key] && !$field["generated"]; $editable = !is_array($row[$key]) && is_utf8($html) && $rows[$n][$key] == $row[$key] && !$functions[$key] && !$field["generated"];
$text = preg_match('~text|json|lob~', $field["type"]); $text = preg_match('~text|json|lob~', $field["type"]);
echo "<td id='$id'" . (preg_match(number_type(), $field["type"]) && ($val == '<i>NULL</i>' || is_numeric(strip_tags($val))) ? " class='number'" : ""); echo "<td id='$id'" . (preg_match(number_type(), $field["type"]) && ($val === null || is_numeric(strip_tags($html))) ? " class='number'" : "");
if (($_GET["modify"] && $editable) || $value !== null) { if (($_GET["modify"] && $editable && $val !== null) || $posted !== null) {
$h_value = h($value !== null ? $value : $row[$key]); $h_value = h($posted !== null ? $posted : $row[$key]);
echo ">" . ($text ? "<textarea name='$id' cols='30' rows='" . (substr_count($row[$key], "\n") + 1) . "'>$h_value</textarea>" : "<input name='$id' value='$h_value' size='$lengths[$key]'>"); echo ">" . ($text ? "<textarea name='$id' cols='30' rows='" . (substr_count($row[$key], "\n") + 1) . "'>$h_value</textarea>" : "<input name='$id' value='$h_value' size='$lengths[$key]'>");
} else { } else {
$long = strpos($val, "<i>…</i>"); $long = strpos($html, "<i>…</i>");
echo " data-text='" . ($long ? 2 : ($text ? 1 : 0)) . "'" echo " data-text='" . ($long ? 2 : ($text ? 1 : 0)) . "'"
. ($editable ? "" : " data-warning='" . h(lang('Use edit link to modify this value.')) . "'") . ($editable ? "" : " data-warning='" . h(lang('Use edit link to modify this value.')) . "'")
. ">$val" . ">$html"
; ;
} }
} }