From 17930c26dfa1e294a77bdca11e2e33021a676de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 4 Dec 2015 12:13:47 +0100 Subject: [PATCH] Properly report error on connecting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The $link can be false at this point and DBI backends handle this correctly to get global error. This usually happens on connecting. Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/DatabaseInterface.class.php | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d8b89a2fb..897a16bb36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog - issue #11691 Query was empty on creating User in 4.5.2 - issue #11695 PMA_getDataForDeleteUsers() warning - issue #11698 Cannot create user on Percona Server +- issue Properly report error on connecting 4.5.2.0 (2015-11-23) - issue #11589 Incorrect parameter in mysqli_fetch_fields() diff --git a/libraries/DatabaseInterface.class.php b/libraries/DatabaseInterface.class.php index f7936962d3..1c0005143b 100644 --- a/libraries/DatabaseInterface.class.php +++ b/libraries/DatabaseInterface.class.php @@ -2959,9 +2959,6 @@ class PMA_DatabaseInterface public function getError($link = null) { $link = $this->getLink($link); - if ($link === false) { - return false; - } return $this->_extension->getError($link); }