From b02f4eec076ded51f258bb00c697ac72c13a9606 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 5 Dec 2011 14:14:13 -0500
Subject: [PATCH] bug #3384035 [display] Problems regarding ShowTooltipAliasTB

---
 ChangeLog                 | 1 +
 libraries/common.lib.php  | 2 +-
 libraries/db_info.inc.php | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4867a0d4b..7105115f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog
 - bug #3442004 [interface] DB suggestion not correct for user with underscore
 - bug #3438420 [core] Magic quotes removed in PHP 5.4
 - bug #3398788 [session] No feedback when result is empty (signon auth_type)
+- bug #3384035 [display] Problems regarding ShowTooltipAliasTB
 
 3.4.8.0 (2011-12-01)
 - bug #3425230 [interface] enum data split at space char (more space to edit)
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index caeeee200..c2ea57ee9 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -811,8 +811,8 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count =
         if ($GLOBALS['cfg']['ShowTooltipAliasTB']
           && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested') {
             // switch tooltip and name
-            $table['Comment'] = $table['Name'];
             $table['disp_name'] = $table['Comment'];
+            $table['Comment'] = $table['Name'];
         } else {
             $table['disp_name'] = $table['Name'];
         }
diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php
index 4dc7eb034..545e366e4 100644
--- a/libraries/db_info.inc.php
+++ b/libraries/db_info.inc.php
@@ -87,7 +87,7 @@ function PMA_fillTooltip(&$tooltip_truename, &$tooltip_aliasname, $table)
     }
 
     if ($GLOBALS['cfg']['ShowTooltipAliasTB']
-     && $GLOBALS['cfg']['ShowTooltipAliasTB'] != 'nested') {
+     && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested') {
         $tooltip_truename[$table['Name']] = $table['Comment'];
         $tooltip_aliasname[$table['Name']] = $table['Name'];
     } else {