Skip to content
Browse files

Merge pull request #225 from kasunchathuranga/Bug3800

Fix bug #3800 Incorrect keyhandler behaviour #2
  • Loading branch information...
2 parents 0d2ef03 + eaa503c commit 66a66ff5fca6fdb391e4029147b18c2ecd417362 @lem9 lem9 committed Apr 2, 2013
Showing with 5 additions and 3 deletions.
  1. +1 −0 ChangeLog
  2. +4 −3 libraries/tbl_properties.inc.php
View
1 ChangeLog
@@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog
- bug #3705 Attempt to open trigger for edit gives NULL
- Use HTML5 DOCTYPE
- [security] Self-XSS on GIS visualisation page, reported by Janek Vind
+- bug #3800 Incorrect keyhandler behaviour #2
3.5.7.0 (2013-02-15)
- bug #3779 [core] Problem with backslash in enum fields
View
7 libraries/tbl_properties.inc.php
@@ -365,7 +365,8 @@
$row['DefaultValue'] = PMA_convert_bit_default_value($row['DefaultValue']);
}
- $content_cells[$i][$ci] = '<select name="field_default_type[' . $i . ']" class="default_type">';
+ $content_cells[$i][$ci] = '<select name="field_default_type[' . $i . ']"'
+ . ' id="field_' . $i . '_' . ($ci - $ci_offset) . '" class="default_type">';
foreach ($default_options as $key => $value) {
$content_cells[$i][$ci] .= '<option value="' . $key . '"';
// is only set when we go back to edit a field's structure
@@ -376,8 +377,8 @@
}
$content_cells[$i][$ci] .= '</select>';
$content_cells[$i][$ci] .= '<br />';
- $content_cells[$i][$ci] .= '<input id="field_' . $i . '_' . ($ci - $ci_offset) . '"'
- . ' type="text" name="field_default_value[' . $i . ']" size="12"'
+ $content_cells[$i][$ci] .= '<input type="text"'
+ . ' name="field_default_value[' . $i . ']" size="12"'
. ' value="' . (isset($row['DefaultValue']) ? htmlspecialchars($row['DefaultValue']) : '') . '"'
. ' class="textfield default_value" />';
$ci++;

0 comments on commit 66a66ff

Please sign in to comment.
Something went wrong with that request. Please try again.