diff options
| author | Daniel Paul Searles <daniel.paul.searles@gmail.com> | 2012-11-05 23:34:50 +0100 |
|---|---|---|
| committer | Daniel Paul Searles <daniel.paul.searles@gmail.com> | 2012-11-05 23:34:50 +0100 |
| commit | 0e4069ba30922941917a26463cba250b0f14c8ef (patch) | |
| tree | 76a7de06b6f8b07ab36ebaffe78235f22dffb1a2 /system/database/drivers/sqlsrv/sqlsrv_driver.php | |
| parent | 3aca5695b2b8561986d11e20e6da46f9b32060f1 (diff) | |
| parent | d743cdbe448258cc7f02abf15e8dc797dc6403eb (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/database/drivers/sqlsrv/sqlsrv_driver.php')
| -rw-r--r-- | system/database/drivers/sqlsrv/sqlsrv_driver.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/system/database/drivers/sqlsrv/sqlsrv_driver.php b/system/database/drivers/sqlsrv/sqlsrv_driver.php index de3d87312..d3999bf75 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_driver.php +++ b/system/database/drivers/sqlsrv/sqlsrv_driver.php @@ -275,8 +275,12 @@ class CI_DB_sqlsrv_driver extends CI_DB { { return $this->data_cache['version']; } + elseif ( ! $this->conn_id) + { + $this->initialize(); + } - if (($info = sqlsrv_server_info($this->conn_id)) === FALSE) + if ( ! $this->conn_id OR ($info = sqlsrv_server_info($this->conn_id)) === FALSE) { return FALSE; } |