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

2013-05-22 11:07:27 +02:00 · 2013-05-22 11:07:27 +02:00 · f681bbe5b7
commit f681bbe5b7
parent f7fab73031 60d662be34
2 changed files with 3 additions and 0 deletions
--- a/1
+++ b/1
@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
 ======================

 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"
--- a/libraries/Header.class.php
+++ b/libraries/Header.class.php
@ -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']