summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/postgre/postgre_driver.php
diff options
context:
space:
mode:
authorDaniel Paul Searles <daniel.paul.searles@gmail.com>2012-11-05 23:34:50 +0100
committerDaniel Paul Searles <daniel.paul.searles@gmail.com>2012-11-05 23:34:50 +0100
commit0e4069ba30922941917a26463cba250b0f14c8ef (patch)
tree76a7de06b6f8b07ab36ebaffe78235f22dffb1a2 /system/database/drivers/postgre/postgre_driver.php
parent3aca5695b2b8561986d11e20e6da46f9b32060f1 (diff)
parentd743cdbe448258cc7f02abf15e8dc797dc6403eb (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/database/drivers/postgre/postgre_driver.php')
-rw-r--r--system/database/drivers/postgre/postgre_driver.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index 028dc1996..40f21b1e8 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -204,8 +204,12 @@ class CI_DB_postgre_driver extends CI_DB {
{
return $this->data_cache['version'];
}
+ elseif ( ! $this->conn_id)
+ {
+ $this->initialize();
+ }
- if (($pg_version = pg_version($this->conn_id)) === FALSE)
+ if ( ! $this->conn_id OR ($pg_version = pg_version($this->conn_id)) === FALSE)
{
return FALSE;
}