From 9bed39f0d4a75afdd103cb80e182e4f7b0aac3bc Mon Sep 17 00:00:00 2001 From: ayushchd Date: Wed, 4 Dec 2013 00:55:58 +0530 Subject: [PATCH 1/3] 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']; From 1eff5df2bd573d8c7d3ece415c28b7eddf28b50c Mon Sep 17 00:00:00 2001 From: ayushchd Date: Wed, 4 Dec 2013 02:42:12 +0530 Subject: [PATCH 2/3] Add additional param in docblock --- libraries/tbl_columns_definition_form.lib.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php index a482403c8d..aec1c8f03a 100644 --- a/libraries/tbl_columns_definition_form.lib.php +++ b/libraries/tbl_columns_definition_form.lib.php @@ -1265,9 +1265,10 @@ 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 */ From a6e7d94a07386283c556cbb2e3a9bbb707964a41 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 4 Dec 2013 07:54:33 -0500 Subject: [PATCH 3/3] ChangeLog entry for fix of bug #4168 Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 6aa6612ad6..7aa64a9473 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,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