bug #3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names in navigation

This commit is contained in:
Madhura Jayaratne
2012-02-18 17:17:01 +05:30
parent 0d1407f178
commit f9b2f08f21
2 changed files with 4 additions and 1 deletions

View File

@@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
3.4.11.0 (not yet released) 3.4.11.0 (not yet released)
- bug #3486970 [import] Exception on XML import - bug #3486970 [import] Exception on XML import
- bug #3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names in navigation
3.4.10.0 (2012-02-14) 3.4.10.0 (2012-02-14)
- bug #3460090 [interface] TextareaAutoSelect feature broken - bug #3460090 [interface] TextareaAutoSelect feature broken

View File

@@ -809,7 +809,9 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count =
if ($GLOBALS['cfg']['ShowTooltipAliasTB'] if ($GLOBALS['cfg']['ShowTooltipAliasTB']
&& $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested') { && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested'
&& $table['Comment'] // do not switch if the comment is empty
) {
// switch tooltip and name // switch tooltip and name
$table['disp_name'] = $table['Comment']; $table['disp_name'] = $table['Comment'];
$table['Comment'] = $table['Name']; $table['Comment'] = $table['Name'];