Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.112.2.4
diff -u -p -r1.112.2.4 form.inc
--- includes/form.inc	2 May 2006 13:04:49 -0000	1.112.2.4
+++ includes/form.inc	14 May 2006 10:54:19 -0000
@@ -344,11 +344,16 @@ function form_builder($form_id, $form) {
             $form['#value'] = !empty($edit) ? $form['#return_value'] : 0;
             break;
           case 'select':
-            if (isset($edit)) {
-              $form['#value'] = $edit;
+            if (isset($form['#multiple']) && $form['#multiple']) {
+              if (isset($edit) && is_array($edit)) {
+                $form['#value'] = drupal_map_assoc($edit);
+              }
+              else {
+                $form['#value'] = array();
+              }
             }
-            elseif (isset($form['#multiple']) && $form['#multiple']) {
-              $form['#value'] = array();
+            elseif (isset($edit)) {
+              $form['#value'] = $edit;
             }
             break;
           case 'textfield':