bug #2967565 UNHEX not selected by default when inserting BINARY

This commit is contained in:
Marc Delisle
2010-03-15 16:15:23 -04:00
parent 79ce179bae
commit 87794051a4
2 changed files with 7 additions and 0 deletions

View File

@@ -56,6 +56,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #2966078 [browse] Incorrect LIMIT is saved and sticks while browsing
- bug #2967366 [Structure] Some results of Propose table structure are
shown in hex
- bug #2967565 [insert] UNHEX not selected by default when inserting BINARY
3.3.1.0 (not yet released)
- bug #2941037 [core] Database structure not sorted by table correctly

View File

@@ -428,6 +428,7 @@ foreach ($rows as $row_id => $vrow) {
$real_null_value = FALSE;
$special_chars_encoded = '';
if (isset($vrow)) {
// (we are editing)
if (is_null($vrow[$field['Field']])) {
$real_null_value = TRUE;
$vrow[$field['Field']] = '';
@@ -460,6 +461,7 @@ foreach ($rows as $row_id => $vrow) {
. $field_name_appendix . '" value="'
. htmlspecialchars($vrow[$field['Field']]) . '" />';
} else {
// (we are inserting)
// display default values
if (!isset($field['Default'])) {
$field['Default'] = '';
@@ -475,6 +477,10 @@ foreach ($rows as $row_id => $vrow) {
}
$backup_field = '';
$special_chars_encoded = PMA_duplicateFirstNewline($special_chars);
// this will select the UNHEX function while inserting
if (($field['is_binary'] || $field['is_blob']) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields'] && ! $cfg['ProtectBinary']) {
$field['display_binary_as_hex'] = true;
}
}
$idindex = ($o_rows * $fields_cnt) + $i + 1;