diff --git a/ChangeLog b/ChangeLog index 9783b02f40..563f17c883 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,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 diff --git a/export.php b/export.php index 21c188ffbd..4b0039db7f 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 diff --git a/libraries/plugins/export/ExportCsv.class.php b/libraries/plugins/export/ExportCsv.class.php index 1ececdcc3a..f5c6fd7ed7 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'));