Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-05-11 06:24:13 +02:00
commit bc4b42a470

View File

@ -22,7 +22,6 @@ $request_params = array(
'original_sql_query',
'query_type',
'reload',
'rows_to_delete',
'selected',
'selected_fld',
'selected_recent_table',
@ -47,7 +46,7 @@ if (! empty($submit_mult)
&& (! empty($selected_db)
|| ! empty($_POST['selected_tbl'])
|| ! empty($selected_fld)
|| ! empty($rows_to_delete))
|| ! empty($_REQUEST['rows_to_delete']))
) {
define('PMA_SUBMIT_MULT', 1);
if (isset($selected_db) && !empty($selected_db)) {
@ -114,7 +113,7 @@ if (! empty($submit_mult)
} else {
// coming from browsing - do something with selected rows
$what = 'row_delete';
$selected = $rows_to_delete;
$selected = $_REQUEST['rows_to_delete'];
}
} // end if