diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php
index 7db67a3..ff59708 100644
--- a/system/libraries/Validation.php
+++ b/system/libraries/Validation.php
@@ -65,18 +65,25 @@
function set_fields($data = '', $field = '')
{
if ($data == '')
- return;
-
- if ( ! is_array($data))
{
- if ($field == '')
- return;
-
- $data = array($data => $field);
+ if (count($this->_fields) == 0)
+ {
+ return FALSE;
+ }
}
-
- $this->_fields = $data;
-
+ else
+ {
+ if ( ! is_array($data))
+ {
+ $data = array($data => $field);
+ }
+
+ if (count($data) > 0)
+ {
+ $this->_fields = $data;
+ }
+ }
+
foreach($this->_fields as $key => $val)
{
$this->$key = ( ! isset($_POST[$key]) OR is_array($_POST[$key])) ? '' : $this->prep_for_form($_POST[$key]);