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

Fix import layout (bug #1370416), prefer recoding of strings over changing MySQL charset as in this case we can show resulting queries.

Browse Source
This commit is contained in:
Michal Čihař
2005-12-05 23:10:28 +00:00
parent 203b511b56
commit 40c9bb105c
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -20,6 +20,9 @@ $Source$
Fix import of some CSV files (bug #1373731), provide better error
messages.
* lang/czech: Update.
* import.php, libraries/display_import.lib.php: Fix import layout (bug
#1370416), prefer recoding of strings over changing MySQL charset as in
this case we can show resulting queries.
2005-12-04 Marc Delisle <lem9@users.sourceforge.net>
* lang/catalan update, thanks to Xavier Navarro (xavin).

3
import.php
View File

@@ -285,8 +285,7 @@ if ($import_file != 'none' && !$error) {
}
// Convert the file's charset if necessary
if (PMA_MYSQL_INT_VERSION < 40100
&& $cfg['AllowAnywhereRecoding'] && $allow_recoding
if ($cfg['AllowAnywhereRecoding'] && $allow_recoding
&& isset($charset_of_file) && $charset_of_file != $charset) {
$charset_conversion = TRUE;
} else if (PMA_MYSQL_INT_VERSION >= 40100

14
libraries/display_import.lib.php
View File

@@ -128,19 +128,15 @@ foreach($import_list as $key => $val) {
<legend><?php echo $strFileToImport; ?></legend>
<div class="formelementrow">
<div class="formelement">
<label for="input_import_file"><?php echo $strLocationTextfile; ?></label>
<input style="margin: 5px" type="file" name="import_file" id="input_import_file" onchange="match_file(this.value);" />
</div>
<?php
echo '<div class="formelement">' . "\n";
echo PMA_displayMaximumUploadSize($max_upload_size);
echo '</div>' . "\n";
echo '<div class="clearfloat"></div>' . "\n";
echo '</div>' . "\n";
echo PMA_displayMaximumUploadSize($max_upload_size) . "\n";
// some browsers should respect this :)
echo PMA_generateHiddenMaxFileSize($max_upload_size) . "\n";
?>
<div>
<?php
if (!empty($cfg['UploadDir'])) {
$extensions = '';
foreach($import_list as $key => $val) {
@@ -169,7 +165,7 @@ if (!empty($cfg['UploadDir'])) {
// charset of file
echo '<div class="formelementrow">' . "\n";
if (PMA_MYSQL_INT_VERSION < 40100 && $cfg['AllowAnywhereRecoding'] && $allow_recoding) {
if ($cfg['AllowAnywhereRecoding'] && $allow_recoding) {
echo '<label for="charset_of_file">' . $strCharsetOfFile . '</label>' . "\n";
$temp_charset = reset($cfg['AvailableCharsets']);
echo $strCharsetOfFile . "\n"