From c6d568d4f3fa48e22a6be22430008deaeaef0372 Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Fri, 14 Jun 2013 23:30:42 +0530 Subject: [PATCH 1/2] Fix bug 3977 - Not detected configuration storage --- ChangeLog | 1 + libraries/RecentTable.class.php | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ce867af7d..18df9f1ffa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 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; } /** From 4d7a77b8df345407005477e98f4a642c24159cf6 Mon Sep 17 00:00:00 2001 From: Aputsiaq Niels Janussen Date: Thu, 13 Jun 2013 20:02:47 +0200 Subject: [PATCH 2/2] Translated using Weblate (Danish) Currently translated at 100.0% (2603 of 2603) --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"