Changeset 3257 for trunk/modules

Timestamp:

08/04/2008 08:38:41 PM (4 months ago)

Author:

Shadowhand

Message:

Fixing #686, thanks galli.

Files:

• trunk/modules/forge/libraries/Form_Dropdown.php (modified) (1 diff)

trunk/modules/forge/libraries/Form_Dropdown.php

@@ -58 +58 @@
                         return $this->is_valid;
 
-                // No data to validate
                 if ($this->input_value() == FALSE)
+                {
+                        // No data to validate
                         return $this->is_valid = FALSE;
+                }
 
                 // Load the submitted value
                 $this->load_value();
 
-                // Use array_key_exists because it properly tests NULL
-                return array_key_exists($this->value, $this->data['options']);
+                if ( ! array_key_exists($this->value, $this->data['options']))
+                {
+                        // Value does not exist in the options
+                        return $this->is_valid = FALSE;
+                }
+
+                return parent::validate();
         }