diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-26 10:32:36 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-26 10:32:36 +0200 |
| commit | b1099b3d3d6908a0b35a0d5a804b4b6e4fd57f66 (patch) | |
| tree | 006a1cd281559f1328140c3c49244373c7edb8df | |
| parent | e0b77de3c32599e2a42c1ade989cbe69eee0e375 (diff) | |
| parent | 84d76ea2559ddd72b5d1ddbe6fa38e88d9b20c16 (diff) | |
Merge pull request #304 from MVUG/mvug_fixes_odbc
odbc calls incorrect parent in construct
| -rw-r--r-- | system/database/drivers/odbc/odbc_driver.php | 2 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index 5e764e071..08cd27b6c 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -50,7 +50,7 @@ class CI_DB_odbc_driver extends CI_DB { function CI_DB_odbc_driver($params) { - parent::CI_DB($params); + parent::CI_DB_driver($params); $this->_random_keyword = ' RND('.time().')'; // database specific random keyword } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index bb80ab8b8..e82fcb2a8 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -113,6 +113,7 @@ Change Log <li>Fixed a bug (#160) - Removed unneeded array copy in the file cache driver.</li> <li>Fixed a bug (#150) - <samp>field_data()</samp> now correctly returns column length.</li> <li>Fixed a bug (#8) - <samp>load_class()</samp> now looks for core classes in <samp>APPPATH</samp> first, allowing them to be replaced.</li> + <li>Fixed a bug (#24) - ODBC database driver called incorrect parent in __construct().</li> </ul> <h2>Version 2.0.3</h2> |