From 611f58ae54581698834d80716a0229dbcc9e005d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 14 Sep 2006 10:21:18 +0000
Subject: [PATCH] Fix table footer when MySQL does not support collations (bug
 #1554885, patch #1557269, thanks to Isaac Bennetch - ibennetch).

---
 ChangeLog                |  5 +++++
 db_details_structure.php | 17 ++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0b69bfa6a8..70cf10d490 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - ChangeLog
 $Id$
 $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>
     * libraries/config.default.php, libraries/export/sql.php:
       bug #1556934, sql compatibility mode on export
diff --git a/db_details_structure.php b/db_details_structure.php
index 878aa57897..359a7ad31e 100644
--- a/db_details_structure.php
+++ b/db_details_structure.php
@@ -408,14 +408,17 @@ if (!($cfg['PropertiesNumColumns'] > 1)) {
     echo '    <th align="center">' . "\n"
        . '        <dfn title="'
        . sprintf($strDefaultEngine, $default_engine) . '">' .$default_engine . '</th>' . "\n";
-    // we got a case where $db_collation was empty
-    echo '    <th align="center">' . "\n";
-    if (! empty($db_collation)) {
-        echo '        <dfn title="'
-           . PMA_getCollationDescr($db_collation) . ' (' . $strDefault . ')">' . $db_collation
-           . '</dfn>';
+    // Have to account for old MySQL with no collation (bug 1554885)
+    if (PMA_MYSQL_INT_VERSION >= 40100) {
+        // we got a case where $db_collation was empty
+        echo '    <th align="center">' . "\n";
+        if (! empty($db_collation)) {
+            echo '        <dfn title="'
+                . PMA_getCollationDescr($db_collation) . ' (' . $strDefault . ')">' . $db_collation
+                . '</dfn>';
+        }
+        echo '</th>';
     }
-    echo '</th>';
 }
 
 if ($is_show_stats) {
-- 
2.11.4.GIT