Fix MSSQL & SQLSRV db_connect()

1 files changed, 16 insertions, 28 deletions

diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php
index 7634be2bb..3026b36dc 100644
--- a/system/database/drivers/mssql/mssql_driver.php
+++ b/system/database/drivers/mssql/mssql_driver.php
@@ -83,40 +83,16 @@ class CI_DB_mssql_driver extends CI_DB {
 	/**
 	 * Non-persistent database connection
 	 *
-	 * @return	resource
-	 */
-	public function db_connect()
-	{
-		return $this->_mssql_connect();
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Persistent database connection
-	 *
-	 * @return	resource
-	 */
-	public function db_pconnect()
-	{
-		return $this->_mssql_connect(TRUE);
-	}
-
-	// --------------------------------------------------------------------
-
-	/*
-	 * MSSQL Connect
-	 *
 	 * @param	bool
 	 * @return	resource
 	 */
-	protected function _mssql_connect($persistent = FALSE)
+	public function db_connect($persistent = FALSE)
 	{
-		$conn_id = ($persistent)
+		$this->conn_id = ($persistent)
 				? @mssql_pconnect($this->hostname, $this->username, $this->password)
 				: @mssql_connect($this->hostname, $this->username, $this->password);
 
-		if ( ! $conn_id)
+		if ( ! $this->conn_id)
 		{
 			return FALSE;
 		}
@@ -127,7 +103,19 @@ class CI_DB_mssql_driver extends CI_DB {
 		$this->_quoted_identifier = empty($query) ? FALSE : (bool) $query['qi'];
 		$this->_escape_char = ($this->_quoted_identifier) ? '"' : array('[', ']');
 
-		return $conn_id;
+		return $this->conn_id;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Persistent database connection
+	 *
+	 * @return	resource
+	 */
+	public function db_pconnect()
+	{
+		return $this->db_connect(TRUE);
 	}
 
 	// --------------------------------------------------------------------