From ba24c28eda01f45b17006cd345a0821f8c618f88 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 11 Nov 2015 13:51:35 -0500 Subject: [PATCH] Fixes #11658 Collation column is empty in table Structure Signed-off-by: Marc Delisle --- ChangeLog | 1 + templates/table/structure/display_structure.phtml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9846289e48..254b934f31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ phpMyAdmin - ChangeLog - issue #11626 wrong row count for query results - issue #11608 Analyzer doesn't recognize GRANT statements - issue #11602 Parser warnings (subqueries) +- issue #11658 Collation column is empty in table Structure 4.5.1.0 (2015-10-23) - issue Invalid argument supplied for foreach() diff --git a/templates/table/structure/display_structure.phtml b/templates/table/structure/display_structure.phtml index a73d5a62ad..51809b1f73 100644 --- a/templates/table/structure/display_structure.phtml +++ b/templates/table/structure/display_structure.phtml @@ -25,6 +25,7 @@ $columns_list[] = $row['Field']; $extracted_columnspec = PMA_Util::extractColumnSpec($row['Type']); $attribute = $extracted_columnspec['attribute']; + $field_charset = $row['Collation']; // prepare a common variable to reuse below; however, // in case of a VIEW, $create_table_fields is empty @@ -96,7 +97,8 @@ 'field_encoded' => urlencode($row['Field']), 'titles' => $titles, 'table' => $table, - 'tbl_storage_engine' => $tbl_storage_engine + 'tbl_storage_engine' => $tbl_storage_engine, + 'field_charset' => $field_charset ) ); ?>