gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Marc Delisle 2013-04-02 10:38:13 -04:00
parent 60df4749c1
commit 89698a9a93
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -108,6 +108,7 @@ underscore
- 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

7
libraries/tbl_columns_definition_form.inc.php
View File

@ -447,7 +447,8 @@ for ($i = 0; $i < $num_fields; $i++) {
}
$content_cells[$i][$ci] = '<select name="field_default_type[' . $i
. ']" class="default_type">';
. ']" 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
@ -458,8 +459,8 @@ for ($i = 0; $i < $num_fields; $i++) {
}
$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'])
: '') . '"'