Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.1241
diff -r1.1241 common.inc
6256a6257,6259
>     'form_element_heading' => array(
>       'render element' => 'element',
>     ),
Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.503
diff -r1.503 form.inc
3635a3636,3640
>     case 'heading':
>       $output .= ' ' . theme('form_element_heading', $variables);
>       $output .= ' ' . $prefix . $element['#children'] . $suffix . "\n";
>       break;
> 
3737a3743,3773
>  * Returns HTML for a form element heading.
>  *
>  * @todo
>  *
>  * @param $variables
>  *   An associative array containing:
>  *   - element: An associative array containing the properties of the element.
>  *     Properties used: #required, #title, #id, #value, #description.
>  *
>  * @ingroup themeable
>  */
> function theme_form_element_heading($variables) {
>   $element = $variables['element'];
>   // This is also used in the installer, pre-database setup.
>   $t = get_t();
> 
>   // If title and required marker are both empty, output no label.
>   if (empty($element['#title']) && empty($element['#required'])) {
>     return '';
>   }
> 
>   // If the element is required, a required marker is appended to the label.
>   $required = !empty($element['#required']) ? theme('form_required_marker', array('element' => $element)) : '';
> 
>   $title = filter_xss_admin($element['#title']);
>   $attributes = array('class' => array('label'));
> 
>   return '<div' . drupal_attributes($attributes) . '>' . $t('!title !required', array('!title' => $title, '!required' => $required)) . "</div>\n";
> }
> 
> /**
Index: modules/simpletest/tests/form.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/form.test,v
retrieving revision 1.72
diff -r1.72 form.test
69c69
<     $required_marker_preg = '@<label.*<span class="form-required" title="This field is required\.">\*</span></label>@';
---
>     $required_marker_preg = '@<(?:label|div class="label").*<span class="form-required" title="This field is required\.">\*</span></(?:label|div)>@';
Index: modules/simpletest/tests/common.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/common.test,v
retrieving revision 1.130
diff -r1.130 common.test
1561c1561
<     $this->assertRenderedElement($element, '//div[contains(@class, :class) and contains(., :markup)]/label[contains(., :label)]', array(
---
>     $this->assertRenderedElement($element, '//div[contains(@class, :class) and contains(., :markup)]/div[contains(., :div)]', array(
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.981
diff -r1.981 system.module
385a386
>     '#title_display' => 'heading',
399a401
>     '#title_display' => 'heading',
450a453
>     '#title_display' => 'heading',
Index: themes/bartik/css/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/css/style.css,v
retrieving revision 1.25
diff -r1.25 style.css
1142c1142
< .form-item label {
---
> .form-item label, div.label {
Index: themes/seven/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/seven/style.css,v
retrieving revision 1.80
diff -r1.80 style.css
586c586
< .form-item label {
---
> .form-item label, div.label {