2 files changed, 2 insertions, 1 deletions

diff --git a/system/libraries/Model.php b/system/libraries/Model.php
index e0335bf45..1c2b7afce 100644
--- a/system/libraries/Model.php
+++ b/system/libraries/Model.php
@@ -36,7 +36,7 @@ class Model {
 	function Model()
 	{
 		// If the magic __get() or __set() methods are used in a Model references can't be used.
-		$this->_assign_libraries( (method_exists($this, '__get') OR method_exists('__set')) ? FALSE : TRUE );
+		$this->_assign_libraries( (method_exists($this, '__get') OR method_exists($this, '__set')) ? FALSE : TRUE );
 		
 		// We don't want to assign the model object to itself when using the
 		// assign_libraries function below so we'll grab the name of the model parent
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index c47972247..16f830c18 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -84,6 +84,7 @@ Change Log
 <li>Added <a href="./database/fields.html">$query->list_fields()</a> function to database class</li>

 <li>Added <a href="./database/helpers.html">$this->db->platform()</a> function</li>

 <li>Added new <a href="./helpers/file_helper.html">File Helper</a>:  get_filenames()</li>

+<li>Added more thorough initialization in the upload class so that all class variables are reset.</li>

 <li>Added "is_numeric" to validation, which uses the native PHP is_numeric function.</li>

 <li>Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.</li>

 <li>Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.</li>