Merging in changes

1 files changed, 9 insertions, 3 deletions

diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index d62071b79..bf3689058 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -77,7 +77,7 @@ class CI_Form_validation {
 		// No reason to set rules if we have no POST data
 		if (count($_POST) == 0)
 		{
-			return;
+			return $this;
 		}
 
 		// If an array was passed via the first parameter instead of indidual string
@@ -98,13 +98,13 @@ class CI_Form_validation {
 				// Here we go!
 				$this->set_rules($row['field'], $label, $row['rules']);
 			}
-			return;
+			return $this;
 		}
 
 		// No fields? Nothing to do...
 		if ( ! is_string($field) OR  ! is_string($rules) OR $field == '')
 		{
-			return;
+			return $this;
 		}
 
 		// If the field label wasn't passed we use the field name
@@ -146,6 +146,8 @@ class CI_Form_validation {
 											'postdata'			=> NULL,
 											'error'				=> ''
 											);
+
+		return $this;
 	}
 
 	// --------------------------------------------------------------------
@@ -169,6 +171,8 @@ class CI_Form_validation {
 		}
 
 		$this->_error_messages = array_merge($this->_error_messages, $lang);
+		
+		return $this;
 	}
 
 	// --------------------------------------------------------------------
@@ -187,6 +191,8 @@ class CI_Form_validation {
 	{
 		$this->_error_prefix = $prefix;
 		$this->_error_suffix = $suffix;
+		
+		return $this;
 	}
 
 	// --------------------------------------------------------------------