summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorRick Ellis <rick.ellis@ellislab.com>2008-10-07 02:48:19 +0200
committerRick Ellis <rick.ellis@ellislab.com>2008-10-07 02:48:19 +0200
commitceb6f0bfdeaad23bad419ff4e62519342cc03d05 (patch)
tree3564df856e72f0d0b123e3c9bc9fbca66edd8063 /system/database
parentb6ba6a3a8ef3d594ff3f32f2d128a8211f1d2db3 (diff)
Added $params to ODBC constructor, based on bug report #3374
Diffstat (limited to 'system/database')
-rw-r--r--system/database/drivers/odbc/odbc_driver.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php
index a64eb56b9..7c59c3060 100644
--- a/system/database/drivers/odbc/odbc_driver.php
+++ b/system/database/drivers/odbc/odbc_driver.php
@@ -39,8 +39,16 @@ class CI_DB_odbc_driver extends CI_DB {
var $_random_keyword;
- function CI_DB_odbc_driver()
+ function CI_DB_odbc_driver($params)
{
+ if (is_array($params))
+ {
+ foreach ($params as $key => $val)
+ {
+ $this->$key = $val;
+ }
+ }
+
$this->_random_keyword = ' RND('.time().')'; // database specific random keyword
}