Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-04-08 09:23:14 +02:00
commit b3b7a5cd0b
3 changed files with 15 additions and 1 deletions

View File

@ -19,6 +19,7 @@ phpMyAdmin - ChangeLog
+ rfe #1635 Have ZeroConf create phpmyadmin DB if possible
+ rfe #763 Warning before silent data conversion/truncation
+ rfe #1650 Support a default page in designer
+ rfe #1651 Allow copying mutiple rows
4.4.2.0 (not yet released)
- bug #4835 PMA_hideShowConnection not called after submit_num_fields

View File

@ -4714,6 +4714,11 @@ class PMA_DisplayResults
__('Change'), 'b_edit.png', 'edit'
);
$links_html .= PMA_Util::getButtonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_copy',
__('Copy'), 'b_insrow.png', 'copy'
);
$links_html .= PMA_Util::getButtonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_delete',
$delete_text, 'b_drop.png', 'delete'

View File

@ -37,6 +37,7 @@ if (! isset($submit_mult)) {
switch($submit_mult) {
case 'row_delete':
case 'row_edit':
case 'row_copy':
case 'row_export':
// leave as is
break;
@ -49,14 +50,21 @@ case 'delete':
$submit_mult = 'row_delete';
break;
default:
case 'copy':
$submit_mult = 'row_copy';
break;
case 'edit':
default:
$submit_mult = 'row_edit';
break;
}
if (!empty($submit_mult)) {
switch($submit_mult) {
case 'row_copy':
$_REQUEST['default_action'] = 'insert';
// no break to allow for fallthough
case 'row_edit':
// As we got the rows to be edited from the
// 'rows_to_delete' checkbox, we use the index of it as the