fixed table layout for inserting/editing row, fixed select for empty value in enum

This commit is contained in:
Michal Čihař
2003-05-20 13:12:28 +00:00
parent afd03151d6
commit cc4c8d20c0
3 changed files with 7 additions and 4 deletions

View File

@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
$Id$
$Source$
2003-05-15 Michal Cihar <nijel@users.sourceforge.net>
* tbl_change.php3: Fixed table layout when LongtextDoubleTextarea is
false.
* tbl_select.php3: Fixed problems with empty value in enum.
2003-05-18 Marc Delisle <lem9@users.sourceforge.net>
* left.php3, index.php3: bug 739348: because the db name is no longer
encoded in left.php3 (to accomodate html entities), we have to stop
@@ -14,7 +19,7 @@ $Source$
2003-05-15 Michal Cihar <nijel@users.sourceforge.net>
* Documentation, config.inc.php3, tbl_change.php3,
libraries/config_import.lib.php3: Double sized textare for LONGTEXT is
libraries/config_import.lib.php3: Double sized textarea for LONGTEXT is
configurable (RFE #737174).
2003-05-14 Michal Cihar <nijel@users.sourceforge.net>

View File

@@ -239,7 +239,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
$bgcolor = ($i % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo'];
?>
<tr>
<td <?php echo (strstr($row_table_def['True_Type'], 'longtext') ? 'rowspan="2"' : ''); ?> align="center" bgcolor="<?php echo $bgcolor; ?>"><?php echo htmlspecialchars($field); ?></td>
<td <?php echo ($cfg['LongtextDoubleTextarea'] && strstr($row_table_def['True_Type'], 'longtext') ? 'rowspan="2"' : ''); ?> align="center" bgcolor="<?php echo $bgcolor; ?>"><?php echo htmlspecialchars($field); ?></td>
<?php
echo "\n";

View File

@@ -50,8 +50,6 @@ if (!isset($param) || $param[0] == '') {
$shorttype = substr($type, 0, 3);
if ($shorttype == 'set' || $shorttype == 'enu') {
$type = eregi_replace(',', ', ', $type);
// Removes automatic MySQL escape format
$type = str_replace('\'\'', '\\\'', $type);
} else {
$type = eregi_replace('BINARY', '', $type);
$type = eregi_replace('ZEROFILL', '', $type);