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

bug #1157230, escape special chars in ENUM or SET

Browse Source
This commit is contained in:
Marc Delisle
2005-07-23 12:16:26 +00:00
parent 3b0a77bc51
commit 6d92b4963f
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$
$Source$
2005-07-23 Marc Delisle <lem9@users.sourceforge.net>
* tbl_properties_structure.php, tbl_properties.inc.php:
bug #1157230, escape special chars in ENUM or SET
2005-07-22 Marc Delisle <lem9@users.sourceforge.net>
* db_details_structure.php: table creation should not be possible
in information_schema

8
tbl_properties.inc.php
View File

@@ -303,14 +303,13 @@ for ($i = 0 ; $i < $num_fields; $i++) {
$content_cells[$i][$ci] = '';
}
$content_cells[$i][$ci] .= "\n" . '<input id="field_' . $i . '_' . ($ci - $ci_offset) . '" type="text" name="field_length[]" size="8" value="' . str_replace('"', '&quot;', $length) . '" class="textfield" />' . "\n";
$ci++;
if (preg_match('@^(set|enum)$@i', $type)) {
$binary = 0;
$unsigned = 0;
$zerofill = 0;
$length_to_display = htmlspecialchars($length);
} else {
$length_to_display = $length;
if (!preg_match('@BINARY[\(]@i', $row['Type']) && PMA_MYSQL_INT_VERSION < 40100) {
$binary = stristr($row['Type'], 'binary');
} else {
@@ -320,6 +319,9 @@ for ($i = 0 ; $i < $num_fields; $i++) {
$zerofill = stristr($row['Type'], 'zerofill');
}
$content_cells[$i][$ci] .= "\n" . '<input id="field_' . $i . '_' . ($ci - $ci_offset) . '" type="text" name="field_length[]" size="8" value="' . str_replace('"', '&quot;', $length_to_display) . '" class="textfield" />' . "\n";
$ci++;
if (PMA_MYSQL_INT_VERSION >= 40100) {
$tmp_collation = empty($row['Collation']) ? NULL : $row['Collation'];
$content_cells[$i][$ci] = PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'field_collation[]', 'field_' . $i . '_' . ($ci - $ci_offset), $tmp_collation, FALSE);