Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.445
diff -u -d -F '^\s*function' -r1.445 form.inc
--- includes/form.inc 26 Mar 2010 18:58:12 -0000 1.445
+++ includes/form.inc 27 Mar 2010 20:37:17 -0000
@@ -3017,33 +3017,27 @@ function theme_form_element($variables)
}
$output = '
' . "\n";
-
- if (isset($element['#field_prefix'])) {
- $output .= '
' . $element['#field_prefix'] . ' ';
- }
+ $prefix = isset($element['#field_prefix']) ? '
' . $element['#field_prefix'] . ' ' : '';
+ $suffix = isset($element['#field_suffix']) ? '
' . $element['#field_suffix'] . '' : '';
switch ($element['#title_display']) {
case 'before':
$output .= ' ' . theme('form_element_label', $variables);
- $output .= ' ' . $element['#children'] . "\n";
+ $output .= ' ' . $prefix . $element['#children'] . $suffix . "\n";
break;
case 'after':
- $output .= ' ' . $element['#children'];
+ $output .= ' ' . $prefix . $element['#children'] . $suffix;
$output .= ' ' . theme('form_element_label', $variables) . "\n";
break;
case 'none':
case 'attribute':
// Output no label and no required marker, only the children.
- $output .= ' ' . $element['#children'] . "\n";
+ $output .= ' ' . $prefix . $element['#children'] . $suffix . "\n";
break;
}
- if (isset($element['#field_suffix'])) {
- $output .= '
' . $element['#field_suffix'] . '';
- }
-
if (!empty($element['#description'])) {
$output .= '
' . $element['#description'] . "
\n";
}