From a8e0f35ef7255f80837194a2f2530141dbe22e38 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 26 Jan 2015 15:35:05 +0530 Subject: [PATCH] bug #4730 Notice while browsing tables when phpmyadmin pma database exists, but not all the tables Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/Table.class.php | 13 ++++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f098ee64b..17460940ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.3.9.0 (not yet released) - bug #4728 Incorrect headings in routine editor +- bug #4730 Notice while browsing tables when phpmyadmin pma database exists, but not all the tables 4.3.8.0 (2015-01-24) - bug Undefined constant PMA_DRIZZLE diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 931ab3ccea..338420d7d4 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1587,12 +1587,9 @@ class PMA_Table if (! isset($_SESSION['tmpval']['table_uiprefs'][$server_id][$this->db_name][$this->name])) { // check whether we can get from pmadb $_SESSION['tmpval']['table_uiprefs'][$server_id][$this->db_name] - [$this->name] - = (/*overload*/mb_strlen($cfgRelation['db']) - && /*overload*/mb_strlen($cfgRelation['table_uiprefs']) - ) - ? $this->getUiPrefsFromDb() - : array(); + [$this->name] = $cfgRelation['uiprefswork'] + ? $this->getUiPrefsFromDb() + : array(); } $this->uiprefs =& $_SESSION['tmpval']['table_uiprefs'][$server_id] [$this->db_name][$this->name]; @@ -1723,9 +1720,7 @@ class PMA_Table // check if pmadb is set $cfgRelation = PMA_getRelationsParam(); - if (/*overload*/mb_strlen($cfgRelation['db']) - && /*overload*/mb_strlen($cfgRelation['table_uiprefs']) - ) { + if ($cfgRelation['uiprefswork']) { return $this->saveUiprefsToDb(); } return true;