Changeset 2869 for trunk/system/libraries/Validation.php

Timestamp:

06/20/2008 10:19:28 AM (5 months ago)

Author:

Shadowhand

Message:

Changed Validation::safe_array() to allow passing a set of keys to use, instead of *all* fields

Files:

• trunk/system/libraries/Validation.php (modified) (3 diffs)

trunk/system/libraries/Validation.php

@@ -92 +92 @@
         /**
          * Returns the ArrayObject values, removing all inputs without rules.
+         * To choose specific inputs, list the field name as arguments.
          *
          * @return  array
@@ -106 +107 @@
                 ));
 
+                // Load choices
+                $choices = func_get_args();
+                $choices = empty($choices) ? NULL : array_combine($choices, $choices);
+
                 $safe = array();
                 foreach ($all_fields as $i => $field)
@@ -118 +123 @@
                         }
 
-                        // Make sure all fields are defined
-                        $safe[$field] = isset($this[$field]) ? $this[$field] : NULL;
+                        if ($choices === NULL OR isset($choices[$field]))
+                        {
+                                // Make sure all fields are defined
+                                $safe[$field] = isset($this[$field]) ? $this[$field] : NULL;
+                        }
                 }