Changeset 2751

Timestamp:

06/06/2008 02:46:15 PM (6 months ago)

Author:

Shadowhand

Message:

Fixing a potential bug in form::dropdown that would not allow options and selected to be set by: form::dropdown(array $data)

Files:

• trunk/system/helpers/form.php (modified) (2 diffs)

trunk/system/helpers/form.php

@@ -237 +237 @@
          * @return  string
          */
-        public static function dropdown($data, $options = array(), $selected = '', $extra = '')
-        {
-                if ( ! is_array($data))
-                {
-                        $data = array('name' => $data);
+        public static function dropdown($data, $options = NULL, $selected = NULL, $extra = '')
+        {
+                if ( ! is_array($data))
+                {
+                        $data = array('name' => $data);
+                }
+                else
+                {
+                        if (isset($data['options']))
+                        {
+                                // Use data options
+                                $options = $data['options'];
+                        }
+
+                        if (isset($data['selected']))
+                        {
+                                // Use data selected
+                                $selected = $data['selected'];
+                        }
                 }
 
@@ -248 +262 @@
 
                 $input = '<select'.form::attributes($data, 'select').' '.$extra.'>'."\n";
-                foreach ($options as $key => $val)
+                foreach ((array) $options as $key => $val)
                 {
                         // Key should always be a string