From 56528d26b674fdc7c14cbf2ca637d22b6294bcb9 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 23 Mar 2007 16:45:44 +0000
Subject: [PATCH]  patch #1681620 [interface] support reordering of
 ['ColumnTypes']

---
 ChangeLog                            | 2 ++
 libraries/database_interface.lib.php | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5b2060ef98..3d395321d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,8 @@ $HeadURL$
 - bug #1674972 [export] no export with %afm%
 - bug #1667887 HTML maxlength
 - bug #1679055 #1050 - Table '<table name>' already exists
+- patch #1681620 [interface] support reordering of $cfg['ColumnTypes'],
+  thanks to Leonard den Ottolander
 
 2.10.0.3 (not released yet)
 =====================
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 0197cd9101..aa73e82114 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -871,10 +871,10 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
         }
 
         // Add some field types to the list, this needs to be done once per session!
-        if ($GLOBALS['cfg']['ColumnTypes'][count($GLOBALS['cfg']['ColumnTypes']) - 1] != 'VARBINARY') {
+        if (!in_array('BINARY', $GLOBALS['cfg']['ColumnTypes']))
             $GLOBALS['cfg']['ColumnTypes'][] = 'BINARY';
+        if (!in_array('VARBINARY', $GLOBALS['cfg']['ColumnTypes']))
             $GLOBALS['cfg']['ColumnTypes'][] = 'VARBINARY';
-        }
 
     } else {
         require_once('./libraries/charset_conversion.lib.php');