diff --git a/ChangeLog b/ChangeLog index 7dd98e2bd..ca4a2d058 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - rfe #2127987 warn when session.gc_maxlifetime is less than cookie validity - rfe #2100910 configurable default charset for import - rfe #1913541 link to InnoDB status when error 1005 occurs +- rfe #1927189 strip ` from column names on import 3.1.1.0 (not yet released) - patch #2242765 [core] Navi panel server links wrong, diff --git a/libraries/import/csv.php b/libraries/import/csv.php index 90fc6e4cc..549672809 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -96,7 +96,8 @@ if (empty($csv_columns)) { if (count($fields) > 0) { $sql_template .= ', '; } - $val = trim($val); + /* Trim also `, if user already included backquoted fields */ + $val = trim($val, " \t\r\n\0\x0B`"); $found = FALSE; foreach ($tmp_fields as $id => $field) { if ($field['Field'] == $val) { diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php index 4a2664146..77ba0c1b9 100644 --- a/libraries/import/ldi.php +++ b/libraries/import/ldi.php @@ -96,7 +96,8 @@ if (strlen($ldi_columns) > 0) { if ($i > 0) { $sql .= ', '; } - $sql .= PMA_backquote(trim($tmp[$i])); + /* Trim also `, if user already included backquoted fields */ + $sql .= PMA_backquote(trim($tmp[$i], " \t\r\n\0\x0B`")); } // end for $sql .= ')'; }