diff --git a/ChangeLog b/ChangeLog index a72d1374bf..9330bc2726 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.0.5.0 (not yet released) +- bug #3977 Not detected configuration storage - bug #3970 Pressing enter in the filter field reloads page 4.0.4.0 (not yet released) diff --git a/libraries/RecentTable.class.php b/libraries/RecentTable.class.php index 9468eeb1c0..101cf3283b 100644 --- a/libraries/RecentTable.class.php +++ b/libraries/RecentTable.class.php @@ -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; } /** diff --git a/po/da.po b/po/da.po index 2c1ce39624..58e1e3be4a 100644 --- a/po/da.po +++ b/po/da.po @@ -9784,7 +9784,7 @@ msgstr "Efter %s" #: libraries/structure.lib.php:1670 #| msgid "Row Statistics" msgid "Row statistics" -msgstr "Rækkestatistikker" +msgstr "Rækkestatistik" #: libraries/structure.lib.php:1675 tbl_printview.php:353 msgid "static"