Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.265.2.4
diff -u -p -r1.265.2.4 form.inc
--- includes/form.inc	11 Feb 2008 14:45:57 -0000	1.265.2.4
+++ includes/form.inc	23 Feb 2008 22:54:29 -0000
@@ -1533,10 +1533,14 @@ function theme_radios($element) {
   $class = 'form-radios';
   if (isset($element['#attributes']['class'])) {
     $class .= ' '. $element['#attributes']['class'];
+  } 
+  $theme_form_element = ($element['#title'] || $element['#description']);
+  $id_string = '';
+  if (!$theme_form_element and !empty($element['#id'])) {
+    $id_string = ' id="'. $element['#id'] .'-wrapper"';
   }
-  $element['#children'] = '<div class="'. $class .'">'. (!empty($element['#children']) ? $element['#children'] : '') .'</div>';
-  if ($element['#title'] || $element['#description']) {
-    unset($element['#id']);
+  $element['#children'] = '<div'. $id_string .' class="'. $class .'">'. (!empty($element['#children']) ? $element['#children'] : '') .'</div>';
+  if ($theme_form_element) {
     return theme('form_element', $element, $element['#children']);
   }
   else {
@@ -1870,10 +1874,14 @@ function theme_checkboxes($element) {
   $class = 'form-checkboxes';
   if (isset($element['#attributes']['class'])) {
     $class .= ' '. $element['#attributes']['class'];
+  } 
+  $theme_form_element = ($element['#title'] || $element['#description']);
+  $id_string = '';
+  if (!$theme_form_element and !empty($element['#id'])) {
+    $id_string = ' id="'. $element['#id'] .'-wrapper"';
   }
-  $element['#children'] = '<div class="'. $class .'">'. (!empty($element['#children']) ? $element['#children'] : '') .'</div>';
-  if ($element['#title'] || $element['#description']) {
-    unset($element['#id']);
+  $element['#children'] = '<div'. $id_string .' class="'. $class .'">'. (!empty($element['#children']) ? $element['#children'] : '') .'</div>';
+  if ($theme_form_element) {
     return theme('form_element', $element, $element['#children']);
   }
   else {