Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.404
diff -u -9 -p -r1.404 form.inc
--- includes/form.inc	22 Nov 2009 18:27:11 -0000	1.404
+++ includes/form.inc	24 Nov 2009 22:42:29 -0000
@@ -2203,19 +2203,20 @@ function form_process_checkboxes($elemen
     if (!isset($element['#default_value']) || $element['#default_value'] == 0) {
       $element['#default_value'] = array();
     }
     foreach ($element['#options'] as $key => $choice) {
       if (!isset($element[$key])) {
         $element[$key] = array(
           '#type' => 'checkbox',
           '#processed' => TRUE,
           '#title' => $choice,
-          '#return_value' => $key,
+          '#return_value' => check_plain($key),
+          '#name' => $element['#name'] . '[' . check_plain($key) . ']',
           '#default_value' => isset($value[$key]) ? $key : NULL,
           '#attributes' => $element['#attributes'],
           '#ajax' => isset($element['#ajax']) ? $element['#ajax'] : NULL,
         );
       }
     }
   }
   return $element;
 }