diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index 47e2d9a437..463081ce32 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -90,19 +90,8 @@ for ($i = 0; $i < $num_fields; $i++) { isset($submit_fulltext) ? $submit_fulltext : null ); - $submit_length - = (isset($_REQUEST['field_length'][$i]) - ? $_REQUEST['field_length'][$i] - : false); - $submit_attribute - = (isset($_REQUEST['field_attribute'][$i]) - ? $_REQUEST['field_attribute'][$i] - : false); - - $submit_default_current_timestamp - = (isset($_REQUEST['field_default_current_timestamp'][$i]) - ? true - : false); + list($submit_length, $submit_attribute, $submit_default_current_timestamp) + = PMA_getSubmitPropertiesForRegeneration(); if (isset($_REQUEST['field_comments'][$i])) { $comments_map[$row['Field']] = $_REQUEST['field_comments'][$i]; diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php index a5ec4be782..92d80d2dc7 100644 --- a/libraries/tbl_columns_definition_form.lib.php +++ b/libraries/tbl_columns_definition_form.lib.php @@ -456,4 +456,30 @@ function PMA_getRowDataForRegeneration($submit_fulltext) return $row; } + +/** + * Function to get submit properties for regenerating previous when error occured. + * + * @return array + */ +function PMA_getSubmitPropertiesForRegeneration() +{ + $submit_length + = (isset($_REQUEST['field_length'][$i]) + ? $_REQUEST['field_length'][$i] + : false); + $submit_attribute + = (isset($_REQUEST['field_attribute'][$i]) + ? $_REQUEST['field_attribute'][$i] + : false); + + $submit_default_current_timestamp + = (isset($_REQUEST['field_default_current_timestamp'][$i]) + ? true + : false); + + return array( + $submit_length, $submit_attribute, $submit_default_current_timestamp + ); +} ?>