Merge branch 'QA_4_1'

ChangeLog

@@ -66,6 +66,7 @@ phpMyAdmin - ChangeLog
 - bug #4159 bug with navigation between database and table filter
 - bug #4119 Huge session data with $cfg['Error_Handler']['gather']
 - bug #4169 Table list jumps to table on click
+- bug #4168 Rename multiple columns is not working
 
 4.0.10.0 (not yet released)
 - bug #4150 Clicking database name in query window opens a new tab

libraries/tbl_columns_definition_form.inc.php

@@ -126,7 +126,7 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
     // old column attributes
     if ($is_backup) {
         $_form_params = PMA_getFormParamsForOldColumn(
-            $columnMeta, $length, $_form_params
+            $columnMeta, $length, $_form_params, $columnNumber
         );
     }
 

libraries/tbl_columns_definition_form.lib.php

@@ -1265,14 +1265,16 @@ function PMA_getHtmlForColumnAttributes($columnNumber, $columnMeta, $type_upper,
 /**
  * Function to get form parameters for old column
  *
- * @param array $columnMeta  column meta
- * @param int   $length      length
- * @param array $form_params form parameters
+ * @param array $columnMeta     column meta
+ * @param int   $length         length
+ * @param array $form_params    form parameters
+ * @param int   $columnNumber   column/field number
  *
  * @return array
  */
-function PMA_getFormParamsForOldColumn($columnMeta, $length, $form_params)
-{
+function PMA_getFormParamsForOldColumn(
+    $columnMeta, $length, $form_params, $columnNumber
+) {
     if (isset($columnMeta['Field'])) {
         $form_params['field_orig[' . $columnNumber . ']']
             = $columnMeta['Field'];