gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_4' of https://github.com/phpmyadmin/phpmyadmin into QA_4_4

Browse Source
This commit is contained in:
Marc Delisle 2015-05-07 08:45:46 -04:00
commit 53677b8e25
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
4.4.6.0 (not yet released)
- bug #4890 webkitStorageInfo and webkitIndexedDB is deprecated
- bug #4892 Undefined variable: unique_conditions
- bug #4891 CSV Import ignores "Replace table data with file" checkbox
4.4.5.0 (2015-05-05)
- bug Table overhead stats: missing space before the unit

6
libraries/config/messages.inc.php
View File

@ -334,7 +334,8 @@ $strConfigImport_csv_col_names_name = __('Lines terminated with');
$strConfigImport_csv_enclosed_name = __('Columns enclosed with');
$strConfigImport_csv_escaped_name = __('Columns escaped with');
$strConfigImport_csv_ignore_name = __('Do not abort on INSERT error');
$strConfigImport_csv_replace_name = __('Replace table data with file');
$strConfigImport_csv_replace_name = __('Add ON DUPLICATE KEY UPDATE');
$strConfigImport_csv_replace_desc = __('Update data when duplicate keys found on import');
$strConfigImport_csv_terminated_name = __('Columns terminated with');
$strConfigImport_format_desc = __(
'Default format; be aware that this list depends on location (database, table) '
@ -345,7 +346,8 @@ $strConfigImport_ldi_enclosed_name = __('Columns enclosed with');
$strConfigImport_ldi_escaped_name = __('Columns escaped with');
$strConfigImport_ldi_ignore_name = __('Do not abort on INSERT error');
$strConfigImport_ldi_local_option_name = __('Use LOCAL keyword');
$strConfigImport_ldi_replace_name = __('Replace table data with file');
$strConfigImport_ldi_replace_name = __('Add ON DUPLICATE KEY UPDATE');
$strConfigImport_ldi_replace_desc = __('Update data when duplicate keys found on import');
$strConfigImport_ldi_terminated_name = __('Columns terminated with');
$strConfigImport_ods_col_names_name = __('Column names in first row');
$strConfigImport_ods_empty_rows_name = __('Do not import empty rows');

2
libraries/plugins/import/AbstractImportCsv.class.php
View File

@ -52,7 +52,7 @@ abstract class AbstractImportCsv extends ImportPlugin
// create common items and add them to the group
$leaf = new BoolPropertyItem();
$leaf->setName("replace");
$leaf->setText(__('Replace table data with file'));
$leaf->setText(__('Update data when duplicate keys found on import (add ON DUPLICATE KEY UPDATE)'));
$generalOptions->addProperty($leaf);
$leaf = new TextPropertyItem();
$leaf->setName("terminated");