nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/QA_3_4' into QA_3_4

Browse Source
This commit is contained in:
Michal Čihař
2012-04-04 22:17:13 +02:00
parent 8bcf725037 ac82ba0f45
commit 168aa47558
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -4,6 +4,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
- bug #3512565 [navi] Fixed missing word "Rows" in table list tooltip after click
3.4.10.2 (2012-03-28)
- [security] Fixed local path disclosure vulnerability, see PMASA-2012-2

2
libraries/Table.class.php
View File

@@ -265,7 +265,7 @@ class PMA_Table
static public function sGetToolTip($db, $table)
{
return PMA_Table::sGetStatusInfo($db, $table, 'Comment')
. ' (' . PMA_Table::countRecords($db, $table) . ')';
. ' (' . PMA_Table::countRecords($db, $table) . ' ' . __('Rows') . ')';
}
/**