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

Do not strip export too much (bug #913988).

Browse Source
This commit is contained in:
Michal Čihař
2004-04-14 13:48:41 +00:00
parent 7dbba54afd
commit c96042f9e1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -16,6 +16,7 @@ $Source$
libraries/config_import.lib.php, libraries/display_export.lib.php, libraries/config_import.lib.php, libraries/display_export.lib.php,
libraries/export/*: Support for enclosing SQL export in transaction (RFE libraries/export/*: Support for enclosing SQL export in transaction (RFE
#930827). #930827).
* libraries/export/csv.php: Do not strip export too much (bug #913988).
2004-04-13 Marc Delisle <lem9@users.sourceforge.net> 2004-04-13 Marc Delisle <lem9@users.sourceforge.net>
* libraries/relation.lib.php: bug 930445 when PMA_table_info not defined, * libraries/relation.lib.php: bug 930445 when PMA_table_info not defined,

3
libraries/export/csv.php
View File

@@ -148,11 +148,10 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
while ($row = PMA_DBI_fetch_row($result)) { while ($row = PMA_DBI_fetch_row($result)) {
$schema_insert = ''; $schema_insert = '';
for ($j = 0; $j < $fields_cnt; $j++) { for ($j = 0; $j < $fields_cnt; $j++) {
if (!isset($row[$j])) { if (!isset($row[$j]) || is_null($row[$j])) {
$schema_insert .= $GLOBALS[$what . '_replace_null']; $schema_insert .= $GLOBALS[$what . '_replace_null'];
} }
else if ($row[$j] == '0' || $row[$j] != '') { else if ($row[$j] == '0' || $row[$j] != '') {
$row[$j] = stripslashes($row[$j]);
// loic1 : always enclose fields // loic1 : always enclose fields
if ($what == 'excel') { if ($what == 'excel') {
$row[$j] = ereg_replace("\015(\012)?", "\012", $row[$j]); $row[$j] = ereg_replace("\015(\012)?", "\012", $row[$j]);