Index: includes/form.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/form.inc,v retrieving revision 1.324 diff -u -p -r1.324 form.inc --- includes/form.inc 14 Mar 2009 20:13:26 -0000 1.324 +++ includes/form.inc 18 Mar 2009 03:57:47 -0000 @@ -2469,19 +2469,21 @@ function theme_form_element($element) { if (!empty($element['#title']) && empty($element['#form_element_skip_title'])) { $title = $element['#title']; if (!empty($element['#id'])) { - $output .= ' ' . $t('!title: !required', array('!title' => filter_xss_admin($title), '!required' => $required)) . "\n"; + $output .= ' ' . $t('!title: !required', array('!title' => filter_xss_admin($title), '!required' => $required)); } else { - $output .= ' ' . $t('!title: !required', array('!title' => filter_xss_admin($title), '!required' => $required)) . "\n"; + $output .= ' ' . $t('!title: !required', array('!title' => filter_xss_admin($title), '!required' => $required)); } - } - $output .= " " . $element['#children'] . "\n"; + if (!empty($element['#description'])) { + $output .= ' ' . $element['#description'] . "\n"; + } - if (!empty($element['#description'])) { - $output .= ' ' . $element['#description'] . "\n"; + $output .= "\n"; } + $output .= ' ' . $element['#children'] . "\n"; + $output .= "\n"; return $output;