From 0553f0204c3ae75d2f02e35cb9b59b66c63554b8 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Fri, 2 Aug 2013 00:00:53 +0530
Subject: [PATCH] added method PMA_handleRegeneration

---
 libraries/tbl_columns_definition_form.inc.php | 32 +++-----------
 libraries/tbl_columns_definition_form.lib.php | 43 +++++++++++++++++++
 2 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 463081ce32..f0e14df369 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -84,33 +84,11 @@ if (isset($field_fulltext) && is_array($field_fulltext)) {
 
 for ($i = 0; $i < $num_fields; $i++) {
     if (! empty($regenerate)) {
-        // An error happened with previous inputs, so we will restore the data
-        // to embed it once again in this form.
-        $row = PMA_getRowDataForRegeneration(
-            isset($submit_fulltext) ? $submit_fulltext : null
-        );
-        
-        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];
-        }
-
-        if (isset($_REQUEST['field_mimetype'][$i])) {
-            $mime_map[$row['Field']]['mimetype'] = $_REQUEST['field_mimetype'][$i];
-        }
-
-        if (isset($_REQUEST['field_transformation'][$i])) {
-            $mime_map[$row['Field']]['transformation']
-                = $_REQUEST['field_transformation'][$i];
-        }
-
-        if (isset($_REQUEST['field_transformation_options'][$i])) {
-            $mime_map[$row['Field']]['transformation_options']
-                = $_REQUEST['field_transformation_options'][$i];
-        }
-
+        list($row, $submit_length, $submit_attribute,
+            $submit_default_current_timestamp, $comments_map, $mime_map)
+            = PMA_handleRegeneration(isset($available_mime) ? $mime_map : null,
+                $comments_map, $mime_map
+            ); 
     } elseif (isset($fields_meta[$i])) {
         $row = $fields_meta[$i];
         switch ($row['Default']) {
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 92d80d2dc7..201d06bd54 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -482,4 +482,47 @@ function PMA_getSubmitPropertiesForRegeneration()
         $submit_length, $submit_attribute, $submit_default_current_timestamp
     );
 }
+
+/**
+ * An error happened with previous inputs, so we will restore the data
+ * to embed it once again in this form.
+ * 
+ * @param array $submit_fulltext
+ * @param array $comments_map
+ * @param array $mime_map
+ * 
+ * @return array
+ */
+function PMA_handleRegeneration($submit_fulltext, $comments_map, $mime_map)
+{
+    $row = PMA_getRowDataForRegeneration(
+        isset($submit_fulltext) ? $submit_fulltext : null
+    );
+
+    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];
+    }
+
+    if (isset($_REQUEST['field_mimetype'][$i])) {
+        $mime_map[$row['Field']]['mimetype'] = $_REQUEST['field_mimetype'][$i];
+    }
+
+    if (isset($_REQUEST['field_transformation'][$i])) {
+        $mime_map[$row['Field']]['transformation']
+            = $_REQUEST['field_transformation'][$i];
+    }
+
+    if (isset($_REQUEST['field_transformation_options'][$i])) {
+        $mime_map[$row['Field']]['transformation_options']
+            = $_REQUEST['field_transformation_options'][$i];
+    }
+    
+    return array(
+        $row, $submit_length, $submit_attribute, $submit_default_current_timestamp,
+        $comments_map, $mime_map
+    );
+}
 ?>