patch #1681620 [interface] support reordering of ['ColumnTypes']

This commit is contained in:
Marc Delisle
2007-03-23 16:52:32 +00:00
parent 2391142941
commit 01f16dc6e5
2 changed files with 5 additions and 2 deletions

View File

@@ -61,6 +61,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #1674972 [export] no export with %afm% - bug #1674972 [export] no export with %afm%
- bug #1667887 HTML maxlength - bug #1667887 HTML maxlength
- bug #1679055 #1050 - Table '<table name>' already exists - 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) 2.10.0.3 (not released yet)
===================== =====================

View File

@@ -868,11 +868,12 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
} }
// Add some field types to the list, this needs to be done once per session! // 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'; $GLOBALS['cfg']['ColumnTypes'][] = 'BINARY';
}
if (!in_array('VARBINARY', $GLOBALS['cfg']['ColumnTypes'])) {
$GLOBALS['cfg']['ColumnTypes'][] = 'VARBINARY'; $GLOBALS['cfg']['ColumnTypes'][] = 'VARBINARY';
} }
} else { } else {
require_once('./libraries/charset_conversion.lib.php'); require_once('./libraries/charset_conversion.lib.php');
} }