diff options
| author | Ahmad Anbar <aanbar@gmail.com> | 2015-04-06 18:59:53 +0200 |
|---|---|---|
| committer | Ahmad Anbar <aanbar@gmail.com> | 2015-04-06 18:59:53 +0200 |
| commit | 5e50c42ef27261bc7fcb279499ce76cfc2519aa6 (patch) | |
| tree | d74d660534b72ddc0b6cda9147cecfb64a225346 /system/database/drivers/sqlsrv | |
| parent | ed520408514fff6486788e1543589418d24d885e (diff) | |
| parent | 7726b75552f765af94038e47a4a4272ac08c646e (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'system/database/drivers/sqlsrv')
| -rw-r--r-- | system/database/drivers/sqlsrv/index.html | 3 | ||||
| -rw-r--r-- | system/database/drivers/sqlsrv/sqlsrv_driver.php | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/system/database/drivers/sqlsrv/index.html b/system/database/drivers/sqlsrv/index.html index c942a79ce..b702fbc39 100644 --- a/system/database/drivers/sqlsrv/index.html +++ b/system/database/drivers/sqlsrv/index.html @@ -1,3 +1,4 @@ +<!DOCTYPE html> <html> <head> <title>403 Forbidden</title> @@ -7,4 +8,4 @@ <p>Directory access is forbidden.</p> </body> -</html>
\ No newline at end of file +</html> diff --git a/system/database/drivers/sqlsrv/sqlsrv_driver.php b/system/database/drivers/sqlsrv/sqlsrv_driver.php index 8f17c8f96..16f77fab2 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_driver.php +++ b/system/database/drivers/sqlsrv/sqlsrv_driver.php @@ -292,10 +292,6 @@ class CI_DB_sqlsrv_driver extends CI_DB { { return $this->data_cache['version']; } - elseif ( ! $this->conn_id) - { - $this->initialize(); - } if ( ! $this->conn_id OR ($info = sqlsrv_server_info($this->conn_id)) === FALSE) { |