Index: form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.190
diff -u -r1.190 form.inc
--- form.inc	24 Apr 2007 13:53:10 -0000	1.190
+++ form.inc	4 May 2007 14:30:59 -0000
@@ -1558,27 +1558,23 @@
  *   A string representing the form element.
  */
 function theme_form_element($element, $value) {
-  $output  = '<div class="form-item"';
-  if (!empty($element['#id'])) {
-    $output .= ' id="'. $element['#id'] .'-wrapper"';
-  }
-  $output .= ">\n";
-  $required = !empty($element['#required']) ? '<span class="form-required" title="'. t('This field is required.') .'">*</span>' : '';
+  $output  = '<div class="form-item">'."\n";
+  $required = $required ? '<span class="form-required" title="'. t('This field is required.') .'">*</span>' : '';
 
-  if (!empty($element['#title'])) {
-    $title = $element['#title'];
-    if (!empty($element['#id'])) {
-      $output .= ' <label for="'. $element['#id'] .'">'. t('!title: !required', array('!title' => $title, '!required' => $required)) ."</label>\n";
+  if ($title) {
+    if ($id) {
+      $output .= ' <label for="'. form_clean_id($id) .'">'. t('%title: %required', array('%title' => $title, '%required' => $required)) . "</label>\n";
     }
     else {
-      $output .= ' <label>'. t('!title: !required', array('!title' => $title, '!required' => $required)) ."</label>\n";
+      $output .= ' <label>'. t('%title: %required', array('%title' => $title, '%required' => $required)) . "</label>\n";
     }
+    $output .= " $value\n";
   }
+  else
+    $output .= t('%value %required', array('%value' =>$value, '%required' => $required)) . "\n";
 
-  $output .= " $value\n";
-
-  if (!empty($element['#description'])) {
-    $output .= ' <div class="description">'. $element['#description'] ."</div>\n";
+  if ($description) {
+    $output .= ' <div class="description">'. $description ."</div>\n";
   }
 
   $output .= "</div>\n";