The branch, master has been updated via 6a786a859e28d5aac0656d9813cf61d004dab56e (commit) via b02f4eec076ded51f258bb00c697ac72c13a9606 (commit) from 63ffeebcf8ff87a380af397a8cb2cbc2b985622a (commit)
- Log ----------------------------------------------------------------- commit 6a786a859e28d5aac0656d9813cf61d004dab56e Merge: 63ffeeb b02f4ee Author: Marc Delisle marc@infomarc.info Date: Mon Dec 5 14:14:26 2011 -0500
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes: 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 28b40c9..f87706e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,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 767e284..fb1c307 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -823,8 +823,8 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = && $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 66c3951..c296f71 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -62,7 +62,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 {
hooks/post-receive