Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-12-04 12:15:05 +01:00
commit 4f2311e1a6
2 changed files with 1 additions and 3 deletions

View File

@ -35,6 +35,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()

View File

@ -2614,9 +2614,6 @@ class DatabaseInterface
public function getError($link = null)
{
$link = $this->getLink($link);
if ($link === false) {
return false;
}
return $this->_extension->getError($link);
}