From 5f2adcb9caa921fba179107fc38c30b907e813d8 Mon Sep 17 00:00:00 2001 From: Ashutosh Dhundhara Date: Fri, 29 Aug 2014 20:39:34 +0530 Subject: [PATCH] Bug #4527: Importing ODS files with column names having trailing spaces fails. Signed-off-by: Ashutosh Dhundhara --- libraries/plugins/import/ImportCsv.class.php | 4 ++++ libraries/plugins/import/ImportOds.class.php | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libraries/plugins/import/ImportCsv.class.php b/libraries/plugins/import/ImportCsv.class.php index ce7af48b32..e6cf0edff2 100644 --- a/libraries/plugins/import/ImportCsv.class.php +++ b/libraries/plugins/import/ImportCsv.class.php @@ -582,6 +582,10 @@ class ImportCsv extends AbstractImportCsv if (isset($_REQUEST['csv_col_names'])) { $col_names = array_splice($rows, 0, 1); $col_names = $col_names[0]; + // MySQL column names can't end with a space character. + foreach ($col_names as $key => $col_name) { + $col_names[$key] = rtrim($col_name); + } } if ((isset($col_names) && count($col_names) != $max_cols) diff --git a/libraries/plugins/import/ImportOds.class.php b/libraries/plugins/import/ImportOds.class.php index b7983bfffd..f8afc13c7c 100644 --- a/libraries/plugins/import/ImportOds.class.php +++ b/libraries/plugins/import/ImportOds.class.php @@ -224,7 +224,9 @@ class ImportOds extends ImportPlugin if (! $col_names_in_first_row) { $tempRow[] = $value; } else { - $col_names[] = $value; + // MySQL column names can't end with a space + // character. + $col_names[] = rtrim($value); } ++$col_count;