summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/sqlsrv
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-11-05 16:01:11 +0100
committerAndrey Andreev <narf@bofh.bg>2012-11-05 16:01:11 +0100
commit2b73037e450859e85fb468ad7499a26882a67292 (patch)
tree8388444fba44c5188c8977949d4a931320cd3e05 /system/database/drivers/sqlsrv
parent522c73623b46afc9082ac7c8af5c34bf1b4f47f4 (diff)
Fix DB drivers version() implementations that don't execute a query
Fails if called prior to the DB connection initialization.
Diffstat (limited to 'system/database/drivers/sqlsrv')
-rw-r--r--system/database/drivers/sqlsrv/sqlsrv_driver.php6
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;
}