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

This commit is contained in:
Weblate 2013-06-14 20:24:05 +02:00
commit 9ce33efe49
2 changed files with 9 additions and 5 deletions

View File

@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
======================
4.0.5.0 (not yet released)
- bug #3977 Not detected configuration storage
4.0.4.0 (not yet released)
- bug #3959 Using DefaultTabDatabase in NavigationTree for Database Click

View File

@ -85,12 +85,15 @@ class PMA_RecentTable
= " SELECT `tables` FROM " . $this->_pmaTable .
" WHERE `username` = '" . $GLOBALS['cfg']['Server']['user'] . "'";
$row = PMA_DBI_fetch_array(PMA_queryAsControlUser($sql_query));
if (isset($row[0])) {
return json_decode($row[0], true);
} else {
return array();
$return = array();
$result = PMA_queryAsControlUser($sql_query, false);
if ($result) {
$row = PMA_DBI_fetch_array($result);
if (isset($row[0])) {
$return = json_decode($row[0], true);
}
}
return $return;
}
/**