From 0181fa9400482b0bc35d38384c321e078e4cb133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kari=20S=C3=B6derholm?= Date: Mon, 10 Jun 2013 12:57:27 -0400 Subject: [PATCH 1/3] Fix regression: Missing removeCRLF option in ExportCsv and ExportExcel plugins. --- libraries/plugins/export/ExportCsv.class.php | 1 + libraries/plugins/export/ExportExcel.class.php | 1 + 2 files changed, 2 insertions(+) diff --git a/libraries/plugins/export/ExportCsv.class.php b/libraries/plugins/export/ExportCsv.class.php index add779405a..98558e9255 100644 --- a/libraries/plugins/export/ExportCsv.class.php +++ b/libraries/plugins/export/ExportCsv.class.php @@ -113,6 +113,7 @@ class ExportCsv extends ExportPlugin $leaf->setText( __('Remove carriage return/line feed characters within columns') ); + $generalOptions->addProperty($leaf); $leaf = new BoolPropertyItem(); $leaf->setName('columns'); $leaf->setText(__('Put columns names in the first row')); diff --git a/libraries/plugins/export/ExportExcel.class.php b/libraries/plugins/export/ExportExcel.class.php index b8e8b020fc..1bb1060d25 100644 --- a/libraries/plugins/export/ExportExcel.class.php +++ b/libraries/plugins/export/ExportExcel.class.php @@ -62,6 +62,7 @@ class ExportExcel extends ExportCsv $leaf->setText( __('Remove carriage return/line feed characters within columns') ); + $generalOptions->addProperty($leaf); $leaf = new BoolPropertyItem(); $leaf->setName('columns'); $leaf->setText(__('Put columns names in the first row')); From 0a13fa1938a3da3fefa9c7dfcb8761ba77004aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kari=20S=C3=B6derholm?= Date: Mon, 10 Jun 2013 12:58:39 -0400 Subject: [PATCH 2/3] Fix missing post params in export.php for removeCRLF option in ExportCsv and ExportExcel plugins. This is needed after commit a564d981e9ef5022d69b2720d6a6126c73c74637 --- export.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/export.php b/export.php index edaf432690..c2373e3051 100644 --- a/export.php +++ b/export.php @@ -54,6 +54,7 @@ $post_params = array( 'codegen_structure_or_data', 'codegen_format', 'excel_null', + 'excel_removeCRLF', 'excel_columns', 'excel_edition', 'excel_structure_or_data', @@ -101,6 +102,7 @@ $post_params = array( 'csv_escaped', 'csv_terminated', 'csv_null', + 'csv_removeCRLF', 'csv_columns', 'csv_structure_or_data', // csv_replace should have been here but we use it directly from $_POST From be6d6733d9fc99f125e6ab0c893c604ec2845aa8 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 10 Jun 2013 13:00:13 -0400 Subject: [PATCH 3/3] ChangeLog entry for pull request 409 --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index b3ccf7b113..0f48b3a556 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog not set - bug #3971 Ctrl/shift + click opens links in same window - bug #3964 Import using https does not work +- bug Missing removeCRLF option in ExportCsv and ExportExcel plugins 4.0.3.0 (2013-06-05) - bug #3941 Recent tables list always empty