Merge branch 'QA_4_3'

This commit is contained in:
Marc Delisle 2014-12-04 10:36:24 -05:00
commit 7134242839
2 changed files with 5 additions and 3 deletions

View File

@ -14,7 +14,7 @@ phpMyAdmin - ChangeLog
- bug #4614 Separator between "Show All" and "Number of rows" disappears
- bug #4615 SQL highlighting in process list breaks on auto refresh
- bug #4616 Warning in db structure print view page
- bug Undefined index navwork, savedsearcheswork
- bug Undefined index navwork, savedsearcheswork, fields
4.3.0.0 (not yet released)
+ rfe #1502 Smart sorting for int keys

View File

@ -1742,8 +1742,10 @@ function PMA_getParamsForUpdateOrInsert()
} else {
// new row => use indexes
$loop_array = array();
foreach ($_REQUEST['fields']['multi_edit'] as $key => $dummy) {
$loop_array[] = $key;
if (! empty($_REQUEST['fields'])) {
foreach ($_REQUEST['fields']['multi_edit'] as $key => $dummy) {
$loop_array[] = $key;
}
}
$using_key = false;
$is_insert = true;