summaryrefslogtreecommitdiffstats
path: root/system/database/drivers
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2011-10-20 08:22:12 +0200
committerAndrey Andreev <narf@bofh.bg>2011-10-20 08:22:12 +0200
commitd8442dd015d9e16929825bc51f3cac25c2f74c73 (patch)
treeb9d1a059683b0e31cf056150cc375941a91be252 /system/database/drivers
parent56b21e1233855e9ea87ece7bb92e7994042b9cb3 (diff)
parent9fca615492ba481f5c27890b3b61f0603f45c55b (diff)
Merge remote-tracking branch 'upstream/develop' into ci-oci8-driver-php5
Diffstat (limited to 'system/database/drivers')
-rw-r--r--system/database/drivers/odbc/odbc_driver.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php
index 08cd27b6c..bcd7937d9 100644
--- a/system/database/drivers/odbc/odbc_driver.php
+++ b/system/database/drivers/odbc/odbc_driver.php
@@ -48,9 +48,9 @@ class CI_DB_odbc_driver extends CI_DB {
var $_random_keyword;
- function CI_DB_odbc_driver($params)
+ function __construct($params)
{
- parent::CI_DB_driver($params);
+ parent::__construct($params);
$this->_random_keyword = ' RND('.time().')'; // database specific random keyword
}