mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
MINOR Revert r111850 to MySQLDatabase::getVersion as version comparisons need to happen, and this will strip out non-numeric characters e.g. "ubuntu1" or "lenny4" which are prefixed on some Linux distros
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@111852 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
5019881d1d
commit
80caa74d9d
@ -100,11 +100,7 @@ class MySQLDatabase extends SS_Database {
|
||||
*/
|
||||
public function getVersion() {
|
||||
if(!$this->mysqlVersion) {
|
||||
$this->mysqlVersion = @mysql_get_server_info($this->dbConn);
|
||||
// fallback to query if function doesn't give anything
|
||||
if(!$this->mysqlVersion) {
|
||||
$this->mysqlVersion = (float)substr(trim(ereg_replace("([A-Za-z-])", "", $this->query("SELECT VERSION()")->value())), 0, 3);
|
||||
}
|
||||
$this->mysqlVersion = (float)substr(trim(ereg_replace("([A-Za-z-])", "", $this->query("SELECT VERSION()")->value())), 0, 3);
|
||||
}
|
||||
return $this->mysqlVersion;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user