webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Code Activity

Merge branch 'QA_3_4' into QA_3_5

Browse Source 
Conflicts:
	libraries/common.lib.php
This commit is contained in:
Madhura Jayaratne
2012-02-18 17:25:38 +05:30
parent 48cbfe14ef f9b2f08f21
commit ff11bfbe64
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -76,6 +76,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

1
libraries/common.lib.php
View File

@@ -828,6 +828,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'];