From d5d50c2d547b2a89cda22d243fcf8389dfa07833 Mon Sep 17 00:00:00 2001 From: stronk7 Date: Mon, 9 Oct 2006 23:36:27 +0000 Subject: [PATCH] Fixed ServerInfo() behaviour for odbc_mssql. We need this working properly NOW! (will be back once ADOdb code supports it properly) --- lib/adodb/drivers/adodb-odbc_mssql.inc.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/adodb/drivers/adodb-odbc_mssql.inc.php b/lib/adodb/drivers/adodb-odbc_mssql.inc.php index 5aa8c52d81..bcfcd849a7 100644 --- a/lib/adodb/drivers/adodb-odbc_mssql.inc.php +++ b/lib/adodb/drivers/adodb-odbc_mssql.inc.php @@ -49,15 +49,13 @@ class ADODB_odbc_mssql extends ADODB_odbc { } // crashes php... + //Note replaced by some different code to allow it to work properly + //for Moode environmental checks function ServerInfo() { - global $ADODB_FETCH_MODE; - $save = $ADODB_FETCH_MODE; - $ADODB_FETCH_MODE = ADODB_FETCH_NUM; $row = $this->GetRow("execute sp_server_info 2"); - $ADODB_FETCH_MODE = $save; - if (!is_array($row)) return false; - $arr['description'] = $row[2]; + + $arr['description'] = $row['attribute_value']; $arr['version'] = ADOConnection::_findvers($arr['description']); return $arr; } @@ -77,7 +75,6 @@ class ADODB_odbc_mssql extends ADODB_odbc { return $this->GetOne($this->identitySQL); } - function MetaForeignKeys($table, $owner=false, $upper=false) { global $ADODB_FETCH_MODE; -- 2.39.5