diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index 78516a94bd..45609f42a6 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -129,18 +129,9 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) { // old column attributes if ($is_backup) { - if (isset($columnMeta['Field'])) { - $_form_params['field_orig[' . $columnNumber . ']'] - = $columnMeta['Field']; - } else { - $_form_params['field_orig[' . $columnNumber . ']'] = ''; - } - // old column length - $_form_params['field_length_orig[' . $columnNumber . ']'] = $length; - - // old column default - $_form_params['field_default_orig[' . $columnNumber . ']'] - = (isset($columnMeta['Default']) ? $columnMeta['Default'] : ''); + $_form_params = PMA_getFormParamsForOldColumn( + $columnMeta, $length, $_form_params + ); } $content_cells[$columnNumber] = PMA_getHtmlForColumnAttributes( diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php index 9159ccf77c..3c265fd487 100644 --- a/libraries/tbl_columns_definition_form.lib.php +++ b/libraries/tbl_columns_definition_form.lib.php @@ -1261,4 +1261,31 @@ function PMA_getHtmlForColumnAttributes($columnNumber, $columnMeta, $type_upper, return $content_cell; } + +/** + * Function to get form parameters for old column + * + * @param array $columnMeta column meta + * @param int $length length + * @param array $form_params form parameters + * + * @return array + */ +function PMA_getFormParamsForOldColumn($columnMeta, $length, $form_params) +{ + if (isset($columnMeta['Field'])) { + $form_params['field_orig[' . $columnNumber . ']'] + = $columnMeta['Field']; + } else { + $form_params['field_orig[' . $columnNumber . ']'] = ''; + } + // old column length + $form_params['field_length_orig[' . $columnNumber . ']'] = $length; + + // old column default + $form_params['field_default_orig[' . $columnNumber . ']'] + = (isset($columnMeta['Default']) ? $columnMeta['Default'] : ''); + + return $form_params; +} ?>