[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-18575-ga67e233

[Madhura Jayaratne]

The branch, master has been updated
       via  a67e233fa7b97223f23e66cf6758505b173612b5 (commit)
       via  5a82da9ad352dede10c4b78cafb055a246e7af5f (commit)
       via  4232fcd458b70913a08240897cde0073c6e78959 (commit)
      from  9d4e9efe4bafbc60a82a02b1cc27d66f150dbc9d (commit)


- Log -----------------------------------------------------------------
commit a67e233fa7b97223f23e66cf6758505b173612b5
Merge: 9d4e9ef 5a82da9
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Sat Sep 10 11:13:49 2011 +0530

    Merge branch 'QA_3_4'
    
    Conflicts:
    	tbl_structure.php

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |    1 +
 tbl_structure.php |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b76d296..e78cf44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,7 @@ phpMyAdmin - ChangeLog
 3.4.6.0 (not yet released)
 - patch #3404173 InnoDB comment display with tooltips/aliases
 - bug #3404886 [navi] Edit SQL statement after error
+- bug #3403165 [interface] Collation not displayed for long enum fields
 
 3.4.5.0 (not yet released)
 - bug #3375325 [interface] Page list in navigation frame looks odd
diff --git a/tbl_structure.php b/tbl_structure.php
index e86636c..c7c0c25 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -272,8 +272,9 @@ foreach ($fields as $row) {
         || substr($type, 0, 10) == 'mediumtext'
         || substr($type, 0, 8) == 'longtext'
         || substr($type, 0, 3) == 'set'
-        || substr($type, 0, 4) == 'enum'
-        ) && !$extracted_fieldspec['binary']) {
+        || substr($type, 0, 4) == 'enum')
+        && !$extracted_fieldspec['binary']
+    ) {
         if (strpos($type, ' character set ')) {
             $type = substr($type, 0, strpos($type, ' character set '));
         }


hooks/post-receive
-- 
phpMyAdmin