From 1042770109d538c66a61db703c6cb7314008b976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 25 Oct 2006 10:07:25 +0000 Subject: [PATCH] Fix cvs/csv typo (bug #1583509). --- ChangeLog | 3 +++ libraries/export/csv.php | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee89d532b..6248aae4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog $Id$ $Source$ +2006-10-25 Michal Čihař + * libraries/export/csv.php: Fix cvs/csv typo (bug #1583509). + 2006-10-19 Marc Delisle * libraries/common.lib.php, /database_interface.lib.php,/session.inc.php: wrong parameter "char" when calling error.php, should be "charset" diff --git a/libraries/export/csv.php b/libraries/export/csv.php index b97034824..c5f73648d 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -67,7 +67,7 @@ function PMA_exportHeader() { $csv_enclosed = '"'; $csv_escaped = '"'; if (isset($GLOBALS['excel_columns'])) { - $GLOBALS['cvs_columns'] = 'yes'; + $GLOBALS['csv_columns'] = 'yes'; } } else { 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); // If required, get fields name at the first line - if (isset($GLOBALS['cvs_columns'])) { + if (isset($GLOBALS['csv_columns'])) { $schema_insert = ''; for ($i = 0; $i < $fields_cnt; $i++) { if ($csv_enclosed == '') {