diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-12-14 15:42:29 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-12-14 15:42:29 +0100 |
| commit | 788fb4aa823179e7c4401f5384207d916697bb7e (patch) | |
| tree | 551fd91834cc4f259d44d2355638552130ca2749 /system/database/drivers/oci8/oci8_driver.php | |
| parent | 97ecf2fcce8e3133e286e16de1b49612235a8dcf (diff) | |
| parent | bc05b84995d5425d6bdc28c43174e70b720840ce (diff) | |
Merge branch '3.0-stable' into develop
Diffstat (limited to 'system/database/drivers/oci8/oci8_driver.php')
| -rw-r--r-- | system/database/drivers/oci8/oci8_driver.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index 916ddeb90..206924d06 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -252,12 +252,16 @@ class CI_DB_oci8_driver extends CI_DB { return $this->data_cache['version']; } - if ( ! $this->conn_id OR ($version = oci_server_version($this->conn_id)) === FALSE) + if ( ! $this->conn_id OR ($version_string = oci_server_version($this->conn_id)) === FALSE) { return FALSE; } + elseif (preg_match('#Release\s(\d+(?:\.\d+)+)#', $version_string, $match)) + { + return $this->data_cache['version'] = $match[1]; + } - return $this->data_cache['version'] = $version; + return FALSE; } // -------------------------------------------------------------------- |