Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-05-22 11:10:11 +02:00
commit d5ea929d80
2 changed files with 3 additions and 0 deletions

View File

@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog
+ [interface] Upgraded CodeMirror to 3.x series
4.0.3.0 (not yet released)
- bug #3941 Recent tables list always empty
4.0.2.0 (not yet released)
- bug #3902 Cannot browse when table name contains keyword "call"

View File

@ -395,6 +395,8 @@ class PMA_Header
}
$retval .= '<div id="page_content">';
$retval .= $this->getMessage();
}
if ($this->_isEnabled && empty($_REQUEST['recent_table'])) {
$retval .= $this->_addRecentTable(
$GLOBALS['db'],
$GLOBALS['table']