Fix pdo_dblib and pdo_sqlsrv db_connect() and suppress warning messages for subdrivers that don't support certain option attributes

1 files changed, 5 insertions, 5 deletions

diff --git a/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php b/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php
index dbf955c2c..7cebae9e6 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php
@@ -121,11 +121,11 @@ class CI_DB_pdo_sqlsrv_driver extends CI_DB_pdo_driver {
 			$this->options[PDO::SQLSRV_ENCODING_UTF8] = 1;
 		}
 
-		$pdo_obj = parent::db_connect($persistent);
+		$this->conn_id = parent::db_connect($persistent);
 
-		if ( ! is_object($pdo_obj) OR is_bool($this->_quoted_identifier))
+		if ( ! is_object($this->conn_id) OR is_bool($this->_quoted_identifier))
 		{
-			return $pdo_obj;
+			return $this->conn_id;
 		}
 
 		// Determine how identifiers are escaped
@@ -134,7 +134,7 @@ class CI_DB_pdo_sqlsrv_driver extends CI_DB_pdo_driver {
 		$this->_quoted_identifier = empty($query) ? FALSE : (bool) $query['qi'];
 		$this->_escape_char = ($this->_quoted_identifier) ? '"' : array('[', ']');
 
-		return $pdo_obj;
+		return $this->conn_id;
 	}
 
 	// --------------------------------------------------------------------
@@ -296,4 +296,4 @@ class CI_DB_pdo_sqlsrv_driver extends CI_DB_pdo_driver {
 }
 
 /* End of file pdo_sqlsrv_driver.php */
-/* Location: ./system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php */
\ No newline at end of file
+/* Location: ./system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php */