nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix table footer when MySQL does not support collations (bug #1554885, patch #1557269, thanks to Isaac Bennetch - ibennetch).

Browse Source
This commit is contained in:
Michal Čihař
2006-09-14 10:21:18 +00:00
parent 75c0fa389a
commit 611f58ae54
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -5,6 +5,11 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$Source$ $Source$
2006-09-14 Michal Čihař <michal@cihar.com>
* db_details_structure.php: Fix table footer when MySQL does not support
collations (bug #1554885, patch #1557269, thanks to Isaac Bennetch -
ibennetch).
2006-09-12 Marc Delisle <lem9@users.sourceforge.net> 2006-09-12 Marc Delisle <lem9@users.sourceforge.net>
* libraries/config.default.php, libraries/export/sql.php: * libraries/config.default.php, libraries/export/sql.php:
bug #1556934, sql compatibility mode on export bug #1556934, sql compatibility mode on export

17
db_details_structure.php
View File

@@ -408,14 +408,17 @@ if (!($cfg['PropertiesNumColumns'] > 1)) {
echo ' <th align="center">' . "\n" echo ' <th align="center">' . "\n"
. ' <dfn title="' . ' <dfn title="'
. sprintf($strDefaultEngine, $default_engine) . '">' .$default_engine . '</th>' . "\n"; . sprintf($strDefaultEngine, $default_engine) . '">' .$default_engine . '</th>' . "\n";
// we got a case where $db_collation was empty // Have to account for old MySQL with no collation (bug 1554885)
echo ' <th align="center">' . "\n"; if (PMA_MYSQL_INT_VERSION >= 40100) {
if (! empty($db_collation)) { // we got a case where $db_collation was empty
echo ' <dfn title="' echo ' <th align="center">' . "\n";
. PMA_getCollationDescr($db_collation) . ' (' . $strDefault . ')">' . $db_collation if (! empty($db_collation)) {
. '</dfn>'; echo ' <dfn title="'
. PMA_getCollationDescr($db_collation) . ' (' . $strDefault . ')">' . $db_collation
. '</dfn>';
}
echo '</th>';
} }
echo '</th>';
} }
if ($is_show_stats) { if ($is_show_stats) {