Fixed version check when not connected to a database

Fixes #13437

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2017-07-09 11:15:47 +02:00
parent 10b04f175a
commit ee1ce07970
2 changed files with 7 additions and 2 deletions

View File

@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
4.7.3 (not yet released)
- issue #13447 Large multi-line query removes Export operation and blanks query box options
- issue #13445 Fixed rendering of query results
- issue #13437 Fixed version check when not connected to a database
4.7.2 (2017-06-29)
- issue #13314 Make theme selection keep current server

View File

@ -217,12 +217,16 @@ class VersionInformation
}
/**
* Returns the MySQL version
* Returns the MySQL version if connected to a database
*
* @return string MySQL version
*/
protected function getMySQLVersion()
{
return PMA_MYSQL_STR_VERSION;
if (defined('PMA_MYSQL_STR_VERSION')) {
return PMA_MYSQL_STR_VERSION;
} else {
return null;
}
}
}