summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2013-01-30 12:57:56 +0100
committerAndrey Andreev <narf@bofh.bg>2013-01-30 12:57:56 +0100
commit8151cbb586edf565a57e33287b01222d9c4a85b6 (patch)
treec69b65072a12f61b1ac586eed1e9449b0fe3f413
parent18c9231236f22db9136184636730385b607863e8 (diff)
Fix/improve #2211
-rw-r--r--system/libraries/Migration.php4
-rw-r--r--user_guide_src/source/changelog.rst1
2 files changed, 3 insertions, 2 deletions
diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php
index fd915c382..b673e9cb7 100644
--- a/system/libraries/Migration.php
+++ b/system/libraries/Migration.php
@@ -104,8 +104,8 @@ class CI_Migration {
*/
public function __construct($config = array())
{
- # Only run this constructor on main library load
- if (get_parent_class($this) !== FALSE)
+ // Only run this constructor on main library load
+ if ( ! in_array(get_class($this), array('CI_Migration', config_item('subclass_prefix').'Migration'), TRUE))
{
return;
}
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index daa1cfc7a..de88dcf28 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -480,6 +480,7 @@ Bug fixes for 3.0
- Fixed a bug - SQLSRV didn't support ``escape_like_str()`` or escaping an array of values.
- Fixed a bug - :doc:`DB result <database/results>` method ``list_fields()`` didn't reset its field pointer for the *mysql*, *mysqli* and *mssql* drivers.
- Fixed a bug (#73) - :doc:`Security Library <libraries/security>` method ``sanitize_filename()`` could be tricked by an XSS attack.
+- Fixed a bug (#2211) - :doc:`Migration Library <libraries/migration>` extensions couldn't execute ``CI_Migration::__construct()``.
Version 2.1.3
=============