From b615dc945006f50f15f479f7b8aeb6894fc2700e Mon Sep 17 00:00:00 2001 From: Lukas Bixen Date: Mon, 9 Aug 2021 00:23:03 -0500 Subject: [PATCH] CSV import: fix column names in top row Signed-off-by: Lukas Bixen --- libraries/classes/Plugins/Import/ImportCsv.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libraries/classes/Plugins/Import/ImportCsv.php b/libraries/classes/Plugins/Import/ImportCsv.php index 428a04ee22..f1f0b69b01 100644 --- a/libraries/classes/Plugins/Import/ImportCsv.php +++ b/libraries/classes/Plugins/Import/ImportCsv.php @@ -16,6 +16,8 @@ use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; use PhpMyAdmin\Properties\Options\Items\NumberPropertyItem; use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Util; + +use function array_shift; use function array_splice; use function basename; use function count; @@ -572,6 +574,12 @@ class ImportCsv extends AbstractImportCsv } $col_names = $this->getColumnNames($col_names, $max_cols, $rows); + + /* Remove the first row if it contains the column names */ + if (isset($_REQUEST['csv_col_names'])) { + array_shift($rows); + } + $tbl_name = $this->getTableNameFromImport((string) $db); $tables[] = [