Merge branch 'QA_3_5'

This commit is contained in:
Madhura Jayaratne 2012-02-18 17:28:22 +05:30
commit 6c9c571e1b
2 changed files with 2 additions and 0 deletions

View File

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

View File

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