Merge branch 'QA_4_0'

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

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

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'));

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'));