summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2008-01-18 01:42:35 +0100
committerDerek Jones <derek.jones@ellislab.com>2008-01-18 01:42:35 +0100
commitc76a3746c9141ab767219fca0f0dbc7535d52cb7 (patch)
tree110a42e6413ca6b758930f970e2cbaaa930158f2
parent646c04f97188b5b95ed14dbb3fc8a976c7c79322 (diff)
Fixed a bug (#3175) preventing certain libraries from working properly when autoloaded in PHP 4 by re-syncing the master object from the copy
-rw-r--r--system/libraries/Controller.php9
-rw-r--r--user_guide/changelog.html3
2 files changed, 11 insertions, 1 deletions
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index 0b34465a2..1b9a42a1a 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -84,6 +84,15 @@ class Controller extends CI_Base {
else
{
$this->_ci_autoloader();
+
+ // sync up the objects since PHP4 was working from a copy
+ foreach (array_keys(get_object_vars($this)) as $attribute)
+ {
+ if (is_object($this->$attribute))
+ {
+ $this->load->$attribute =& $this->$attribute;
+ }
+ }
}
}
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index ab9338116..89276e246 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -123,7 +123,8 @@ Change Log
<li>Fixed a bug in the clean_email() method of the Email class to allow for non-numeric / non-sequential array keys.</li>
<li>Fixed a bug in Pagination to scan for non-positive num_links.</li>
<li>Fixed a bug in the typography helper causing extraneous paragraph tags when string contains tags.</li>
- <li>Fixed a bug in the Encryption Library to support modes other than MCRYPT_MODE_ECB</li>
+ <li>Fixed a bug in the Encryption Library to support modes other than MCRYPT_MODE_ECB</li>
+ <li>Fixed a bug (#3175) preventing certain libraries from working properly when autoloaded in PHP 4</li>
<li>Fixed an example of comma-separated emails in the email library documentation.</li>
<li>Fixed an example in the Calendar library for Showing Next/Previous Month Links.</li>
<li>Fixed a typo in the database language file.</li>