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

Merge branch 'QA_3_4'

Browse Source
This commit is contained in:
Marc Delisle 2011-05-15 13:24:42 -04:00
commit 8d3f3201fa
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -10,6 +10,7 @@
3.4.1.0 (not yet released)
- bug #3301108 [interface] Synchronize and already configured host
- Bug #3302457 Inline edit and $cfg['PropertiesIconic']
- Patch #3302313 Show a translated label
3.4.0.0 (2011-05-11)
+ rfe #2890226 [view] Enable VIEW rename

2
libraries/import/csv.php
View File

@ -38,7 +38,7 @@ if (isset($plugin_list)) {
} else {
$hint = new PMA_Message(__('If the data in each row of the file is not in the same order as in the database, list the corresponding column names here. Column names must be separated by commas and not enclosed in quotations.'));
$plugin_list['csv']['options'][] =
array('type' => 'text', 'name' => 'columns', 'text' => __('Column names: ' . PMA_showHint($hint)));
array('type' => 'text', 'name' => 'columns', 'text' => __('Column names: ') . PMA_showHint($hint));
}
$plugin_list['csv']['options'][] = array('type' => 'end_group');