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

Fix cvs/csv typo (bug #1583509).

Browse Source
This commit is contained in:
Michal Čihař
2006-10-25 10:07:25 +00:00
parent 5aeac4294f
commit 1042770109
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$Source$ $Source$
2006-10-25 Michal Čihař <michal@cihar.com>
* libraries/export/csv.php: Fix cvs/csv typo (bug #1583509).
2006-10-19 Marc Delisle <lem9@users.sourceforge.net> 2006-10-19 Marc Delisle <lem9@users.sourceforge.net>
* libraries/common.lib.php, /database_interface.lib.php,/session.inc.php: * libraries/common.lib.php, /database_interface.lib.php,/session.inc.php:
wrong parameter "char" when calling error.php, should be "charset" wrong parameter "char" when calling error.php, should be "charset"

4
libraries/export/csv.php
View File

@@ -67,7 +67,7 @@ function PMA_exportHeader() {
$csv_enclosed = '"'; $csv_enclosed = '"';
$csv_escaped = '"'; $csv_escaped = '"';
if (isset($GLOBALS['excel_columns'])) { if (isset($GLOBALS['excel_columns'])) {
$GLOBALS['cvs_columns'] = 'yes'; $GLOBALS['csv_columns'] = 'yes';
} }
} else { } else {
if (empty($csv_terminated) || strtolower($csv_terminated) == 'auto') { if (empty($csv_terminated) || strtolower($csv_terminated) == 'auto') {
@@ -146,7 +146,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
$fields_cnt = PMA_DBI_num_fields($result); $fields_cnt = PMA_DBI_num_fields($result);
// If required, get fields name at the first line // If required, get fields name at the first line
if (isset($GLOBALS['cvs_columns'])) { if (isset($GLOBALS['csv_columns'])) {
$schema_insert = ''; $schema_insert = '';
for ($i = 0; $i < $fields_cnt; $i++) { for ($i = 0; $i < $fields_cnt; $i++) {
if ($csv_enclosed == '') { if ($csv_enclosed == '') {