From 80caa74d9d70fe245500bdfedf2f34d830c240f6 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Mon, 11 Oct 2010 01:17:19 +0000 Subject: [PATCH] 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 --- core/model/MySQLDatabase.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/model/MySQLDatabase.php b/core/model/MySQLDatabase.php index 658c0e34c..428c57a00 100755 --- a/core/model/MySQLDatabase.php +++ b/core/model/MySQLDatabase.php @@ -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; }