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

backporte some bugfixes from trunk intp QA_2_10:

Browse Source 
- bug #1567317 [sqp] Syntax highlighter: extra spaces
- bug #1239401 [sqp] table dot numeric field name
- bug #1672789 [sqp] Undefined offset: 4 in sqlparser.lib.php #1674
- bug #1682044 [export] Export file even if file not selected
- bug #1664212 querywindow loses url encoded characters
+ [config] clean cookies on phpMyAdmin upgrade
- bug #1674972 [export] no export with %afm%
- bug #1667887 HTML maxlength
- bug #1679055 #1050 - Table '<table name>' already exists
This commit is contained in:
Sebastian Mendel
2007-03-20 11:22:31 +00:00
parent 34ad4cdd3b
commit f1378fcbf1
9 changed files with 162 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tbl_change.php
View File

@@ -839,19 +839,14 @@ foreach ($loop_array as $vrowcount => $vrow) {
<?php
} else {
if ($len < 4) {
$fieldsize = $maxlength = 4;
} else {
$fieldsize = (($len > 40) ? 40 : $len);
$maxlength = $len;
}
// field size should be at least 4 and max 40
$fieldsize = min(max($len, 4), 40);
echo "\n";
?>
<td>
<?php echo $backup_field . "\n"; ?>
<input type="text" name="fields<?php echo $field_name_appendix; ?>"
value="<?php echo $special_chars; ?>" size="<?php echo $fieldsize; ?>"
maxlength="<?php echo $maxlength; ?>"
class="textfield" <?php echo $unnillify_trigger; ?>
tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>"
id="field_<?php echo ($idindex); ?>_3" />
@@ -908,19 +903,8 @@ foreach ($loop_array as $vrowcount => $vrow) {
} // end elseif ( binary or blob)
else {
// For char or varchar, respect the maximum length (M); for other
// types (int or float), the length is not a limit on the values that
// can be entered, so let's be generous (20) (we could also use the
// real limits for each numeric type)
// 2004-04-07, it turned out that 20 was not generous enough
// for the maxlength
if ($is_char) {
$fieldsize = (($len > 40) ? 40 : $len);
$maxlength = $len;
} else {
$fieldsize = 20;
$maxlength = 99;
} // end if... else...
// field size should be at least 4 and max 40
$fieldsize = min(max($len, 4), 40);
?>
<td>
<?php
@@ -941,7 +925,6 @@ foreach ($loop_array as $vrowcount => $vrow) {
?>
<input type="text" name="fields<?php echo $field_name_appendix; ?>"
value="<?php echo $special_chars; ?>" size="<?php echo $fieldsize; ?>"
maxlength="<?php echo $maxlength; ?>"
class="textfield" <?php echo $unnillify_trigger; ?>
tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>"
id="field_<?php echo ($idindex); ?>_3" />