diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-06-04 22:07:37 +0200 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-06-04 22:07:37 +0200 |
commit | 005dd437c506706f3f277eac76eb1b4a3bbc1b2d (patch) | |
tree | fdbbce7610a569d18dc839b6b44b3c89b116b3df | |
parent | 10d78f61399dd647ada0afaa43e5e9ec48d55e82 (diff) | |
parent | 2fd0506ebcfeeadc0a07c4667d1997d0d30b205e (diff) |
Merge pull request #1420 from IT-Can/fix-issue-1419
Fix issues #1397, #1419
-rw-r--r-- | system/libraries/Driver.php | 2 | ||||
-rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/system/libraries/Driver.php b/system/libraries/Driver.php index c79698c7b..d67ee2549 100644 --- a/system/libraries/Driver.php +++ b/system/libraries/Driver.php @@ -51,7 +51,7 @@ class CI_Driver_Library { * * @var string */ - protected static $lib_name; + protected $lib_name; /** * The first time a child is used it won't exist, so we instantiate it diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index de4af7efe..587e56ea7 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -224,6 +224,7 @@ Bug fixes for 3.0 - Fixed a bug (#319) - SQLSRV's affected_rows() method failed due to a scrollable cursor being created for write-type queries. - Fixed a bug (#356) - PostgreSQL driver didn't have an _update_batch() method, which resulted in fatal error being triggered when update_batch() is used with it. - Fixed a bug (#862) - create_table() failed on SQLSRV/MSSQL when used with 'IF NOT EXISTS'. +- Fixed a bug (#1419) - libraries/Driver.php had a static variable that was causing an error. Version 2.1.1 ============= |