diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php
index e7345d58b4..bdcaa9a76f 100644
--- a/libraries/central_columns.lib.php
+++ b/libraries/central_columns.lib.php
@@ -692,6 +692,8 @@ function PMA_getCentralColumnsTableHeader($class='', $title='', $actionCount=0)
. __('Type') . '
'
. ''
. __('Length/Values') . ' | '
+ . ''
+ . __('Default') . ' | '
. '' . __('Collation') . ' | '
. ' | '
. ''
. __('Extra') . ' | '
- . ''
- . __('Default') . ' | '
. '';
$tableheader .= '';
return $tableheader;
@@ -875,6 +875,28 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db)
. PMA_getHtmlForColumnLength($row_num, 2, 0, 8, $row['col_length'])
. '';
+ $meta = array();
+ if (!isset($row['col_default']) || $row['col_default'] == '') {
+ $meta['DefaultType'] = 'NONE';
+ } else {
+ if ($row['col_default'] == 'CURRENT_TIMESTAMP'
+ || $row['col_default'] == 'NULL'
+ ) {
+ $meta['DefaultType'] = $row['col_default'];
+ } else {
+ $meta['DefaultType'] = 'USER_DEFINED';
+ $meta['DefaultValue'] = $row['col_default'];
+ }
+ }
+ $tableHtml .=
+ '' . (isset($row['col_default'])
+ ? htmlspecialchars($row['col_default']) : 'None')
+ . ''
+ . PMA_getHtmlForColumnDefault(
+ $row_num, 6, 0, /*overload*/mb_strtoupper($row['col_type']), '', $meta
+ )
+ . ' | ';
+
$tableHtml .=
''
. '' . htmlspecialchars($row['col_collation']) . ''
@@ -906,28 +928,9 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db)
. ''
. ''
. ' | ';
- $meta = array();
- if (!isset($row['col_default']) || $row['col_default'] == '') {
- $meta['DefaultType'] = 'NONE';
- } else {
- if ($row['col_default'] == 'CURRENT_TIMESTAMP'
- || $row['col_default'] == 'NULL'
- ) {
- $meta['DefaultType'] = $row['col_default'];
- } else {
- $meta['DefaultType'] = 'USER_DEFINED';
- $meta['DefaultValue'] = $row['col_default'];
- }
- }
- $tableHtml .=
- '' . (isset($row['col_default'])
- ? htmlspecialchars($row['col_default']) : 'None')
- . ''
- . PMA_getHtmlForColumnDefault(
- $row_num, 6, 0, /*overload*/mb_strtoupper($row['col_type']), '', $meta
- )
- . ' | ';
+
$tableHtml .= '';
+
return $tableHtml;
}
@@ -1164,6 +1167,9 @@ function PMA_getHTMLforAddNewColumn($db)
. ''
. PMA_getHtmlForColumnLength(0, 2, 0, 8, '')
. ' | '
+ . ''
+ . PMA_getHtmlForColumnDefault(0, 6, 0, '', '', array())
+ . ' | '
. ''
. PMA_getHtmlForColumnCollation(
0, 3, 0, array()
@@ -1181,9 +1187,6 @@ function PMA_getHTMLforAddNewColumn($db)
. ''
. ' | '
- . ''
- . PMA_getHtmlForColumnDefault(0, 6, 0, '', '', array())
- . ' | '
. ' '
. ' | '