From 9bed39f0d4a75afdd103cb80e182e4f7b0aac3bc Mon Sep 17 00:00:00 2001
From: ayushchd <ayushchd@gmail.com>
Date: Wed, 4 Dec 2013 00:55:58 +0530
Subject: [PATCH] fix bug #4168 Rename multiple columns is not working

---
 libraries/tbl_columns_definition_form.inc.php | 2 +-
 libraries/tbl_columns_definition_form.lib.php | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index d2d2093503..60170677b6 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/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
         );
     }
 
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index bd8f14f5f6..a482403c8d 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -1271,8 +1271,9 @@ function PMA_getHtmlForColumnAttributes($columnNumber, $columnMeta, $type_upper,
  *
  * @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'];