Merge pull request #1102 from maxday/420-cfg-CharEditing-textarea-for-structure-edit

#420 $cfg['CharEditing']='textarea' for structure edit

1 files changed, 15 insertions, 6 deletions

diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index bcfa6122d8..130641162a 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -1100,12 +1100,21 @@ function PMA_getHtmlForColumnDefault($columnNumber, $ci, $ci_offset, $type_upper
     }
     $html .= '</select>';
     $html .= '<br />';
-    $html .= '<input type="text"'
-        . ' name="field_default_value[' . $columnNumber . ']" size="12"'
-        . ' value="' . (isset($columnMeta['DefaultValue'])
-            ? htmlspecialchars($columnMeta['DefaultValue'])
-            : '') . '"'
-        . ' class="textfield default_value" />';
+
+    $value = isset($columnMeta['DefaultValue']) ? htmlspecialchars($columnMeta['DefaultValue']) : '';
+    if($GLOBALS['cfg']['CharEditing'] == 'textarea') {
+        $html .= '<textarea'
+            . ' name="field_default_value[' . $columnNumber . ']" cols="15"'
+            . ' class="textfield default_value">'
+            . $value
+            . '</textarea>';
+    }
+    else {
+        $html .= '<input type="text"'
+            . ' name="field_default_value[' . $columnNumber . ']" size="12"'
+            . ' value="' . $value . '"'
+            . ' class="textfield default_value" />';
+    }
 
     return $html;
 }