2 files changed, 4 insertions, 9 deletions

diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php
index 3b2be23d5..1572a587c 100644
--- a/system/libraries/Ftp.php
+++ b/system/libraries/Ftp.php
@@ -178,7 +178,7 @@ class CI_FTP {
 		
 		if ($result === FALSE)
 		{
-			if ($this->debug == TRUE AND $supress_debug != TRUE)
+			if ($this->debug == TRUE AND $supress_debug == FALSE)
 			{
 				$this->_error('ftp_unable_to_changedir');
 			}		
@@ -251,7 +251,7 @@ class CI_FTP {
 		// Set the mode if not specified
 		if ($mode == 'auto')
 		{
-			// Get the file extension so we can se the upload type
+			// Get the file extension so we can set the upload type
 			$ext = $this->_getext($locpath);
 			$mode = $this->_settype($ext);
 		}
diff --git a/system/libraries/Model.php b/system/libraries/Model.php
index 1c2b7afce..6f4f7e7ef 100644
--- a/system/libraries/Model.php
+++ b/system/libraries/Model.php
@@ -40,12 +40,7 @@ class Model {
 		
 		// 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
-		$methods = get_class_methods($this);
-						
-		if (isset($methods[0]))
-		{
-			$this->_parent_name = $methods[0];
-		}
+		$this->_parent_name = ucfirst(get_class($this));
 		
 		log_message('debug', "Model Class Initialized");
 	}
@@ -65,7 +60,7 @@ class Model {
 		foreach (array_keys(get_object_vars($CI)) as $key)
 		{
 			if ( ! isset($this->$key) AND $key != $this->_parent_name)
-			{
+			{			
 				// In some cases using references can cause
 				// problems so we'll conditionally use them
 				if ($use_reference == TRUE)