Added clear_messages and clear_errors methods to the model. Added cle…

…aring of deactivate message during registration process.

libraries/Ion_auth.php

@@ -319,8 +319,13 @@ public function register($username, $password, $email, $additional_data = array(
 				return FALSE;
 			}
 
+			//deactivate so the user much follow the activation flow
 			$deactivate = $this->ion_auth_model->deactivate($id);
 
+			//the deactivate method call adds a message, here we need to clear that
+			$this->ion_auth_model->clear_messages();
+
+
 			if (!$deactivate)
 			{
 				$this->set_error('deactivate_unsuccessful');
@@ -360,7 +365,7 @@ public function register($username, $password, $email, $additional_data = array(
 					$this->set_message('activation_email_successful');
 					return $id;
 				}
-			
+
 			}
 
 			$this->ion_auth_model->trigger_events(array('post_account_creation', 'post_account_creation_unsuccessful', 'activation_email_unsuccessful'));

models/ion_auth_model.php

@@ -2103,6 +2103,8 @@ public function set_message($message)
 		return $message;
 	}
 
+
+
 	/**
 	 * messages
 	 *
@@ -2149,6 +2151,23 @@ public function messages_array($langify = TRUE)
 		}
 	}
 
+
+	/**
+	 * clear_messages
+	 *
+	 * Clear messages
+	 *
+	 * @return void
+	 * @author Ben Edmunds
+	 **/
+	public function clear_messages()
+	{
+		$this->messages = array();
+
+		return TRUE;
+	}
+
+
 	/**
 	 * set_error
 	 *
@@ -2210,6 +2229,24 @@ public function errors_array($langify = TRUE)
 		}
 	}
 
+
+	/**
+	 * clear_errors
+	 *
+	 * Clear Errors
+	 *
+	 * @return void
+	 * @author Ben Edmunds
+	 **/
+	public function clear_errors()
+	{
+		$this->errors = array();
+
+		return TRUE;
+	}
+
+
+
 	protected function _filter_data($table, $data)
 	{
 		$filtered_data = array();