From 9b61212b4818e2760e48b63d32e5808409808bad Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 19 May 2013 08:44:45 -0400 Subject: [PATCH] bug #3946 Missing CSV import option "Do not abort on INSERT error" --- ChangeLog | 1 + libraries/plugins/import/ImportCsv.class.php | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 85263ef699..f336089065 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog - bug #3930 Databases to choose for specific privileges show up escaped - bug #3910 Export database with empty table as a php array, does not produce valid PHP - bug #3936 Query profiler chart not loading from SQL Query page +- bug #3946 Missing CSV import option "Do not abort on INSERT error" 4.0.1.0 (2013-05-14) - bug #3879 Import broken for CSV using LOAD DATA diff --git a/libraries/plugins/import/ImportCsv.class.php b/libraries/plugins/import/ImportCsv.class.php index d264783d86..e22d148f70 100644 --- a/libraries/plugins/import/ImportCsv.class.php +++ b/libraries/plugins/import/ImportCsv.class.php @@ -83,6 +83,12 @@ class ImportCsv extends AbstractImportCsv ); $generalOptions->addProperty($leaf); } + + $leaf = new BoolPropertyItem(); + $leaf->setName("ignore"); + $leaf->setText(__('Do not abort on INSERT error')); + $generalOptions->addProperty($leaf); + } /**