From 507ca058a456999929a5561639088a53ad270241 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Mon, 5 Aug 2013 23:08:51 +0530
Subject: [PATCH] added method PMA_getHtmlForColumnCollation

---
 libraries/tbl_columns_definition_form.inc.php |  7 ++-----
 libraries/tbl_columns_definition_form.lib.php | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 7127f7f7ea..382ce156a2 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -234,12 +234,9 @@ for ($i = 0; $i < $num_fields; $i++) {
     $ci++;
 
     // column collation
-    $tmp_collation          = empty($row['Collation']) ? null : $row['Collation'];
-    $content_cells[$i][$ci] = PMA_generateCharsetDropdownBox(
-        PMA_CSDROPDOWN_COLLATION, 'field_collation[' . $i . ']',
-        'field_' . $i . '_' . ($ci - $ci_offset), $tmp_collation, false
+    $content_cells[$i][$ci] = PMA_getHtmlForColumnCollation(
+        $i, $ci, $ci_offset, $row
     );
-    unset($tmp_collation);
     $ci++;
 
     // column attribute
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 56ce350ebe..ea565ff4b8 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -957,4 +957,25 @@ function PMA_getHtmlForColumnAttribute($i, $ci, $ci_offset, $extracted_columnspe
     
     return $html;
 }
+
+/**
+ * Function to get html for column collation
+ * 
+ * @param int   $i         field number
+ * @param int   $ci        cell index
+ * @param int   $ci_offset cell index offset
+ * @param array $row       row
+ * 
+ * @return string
+ */
+function PMA_getHtmlForColumnCollation($i, $ci, $ci_offset, $row)
+{
+    $tmp_collation = empty($row['Collation']) ? null : $row['Collation'];
+    $html = PMA_generateCharsetDropdownBox(
+        PMA_CSDROPDOWN_COLLATION, 'field_collation[' . $i . ']',
+        'field_' . $i . '_' . ($ci - $ci_offset), $tmp_collation, false
+    );
+    
+    return $html;
+}
 ?>