diff options
| -rw-r--r-- | includes/form.inc | 2 | ||||
| -rw-r--r-- | modules/simpletest/tests/form.test | 5 | ||||
| -rw-r--r-- | modules/simpletest/tests/form_test.module | 9 |
3 files changed, 15 insertions, 1 deletions
diff --git a/includes/form.inc b/includes/form.inc index 63c322abd..da6e03027 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -3084,7 +3084,7 @@ function form_pre_render_conditional_form_element($element) { $element['#attributes']['title'] = $element['#title']; if (!empty($element['#required'])) { // Append an indication that this field is required. - $element['#attributes']['title'] .= ' (' . $t('Required') . ')'; + $element['#attributes']['title'] .= ' (' . t('Required') . ')'; } } diff --git a/modules/simpletest/tests/form.test b/modules/simpletest/tests/form.test index ec7df2c33..1766126a8 100644 --- a/modules/simpletest/tests/form.test +++ b/modules/simpletest/tests/form.test @@ -703,6 +703,11 @@ class FormsElementsLabelsTestCase extends DrupalWebTestCase { $elements = $this->xpath('//div[@id="form-test-textfield-title-suffix"]/preceding-sibling::div[contains(@class, \'form-item-form-textfield-test-title\')]'); $this->assertTrue(isset($elements[0]), t("Properly places the #suffix element before the form item.")); + + // Check that required checkboxes with #title_display attribute have + // a description but no title is displayed. + $this->assertFieldByXPath('//div[contains(@class, "form-item-form-checkboxes-test-title-display-attribute")]/div[contains(@class, "description")]', NULL, 'Description displayed for #title_display attribute.'); + $this->assertNoFieldByXPath('//label[@for="edit-form-checkboxes-test-title-display-attribute"]', NULL, 'No title displayed for #title_display attribute.'); } } diff --git a/modules/simpletest/tests/form_test.module b/modules/simpletest/tests/form_test.module index 1c16c39c7..3a8c4ca12 100644 --- a/modules/simpletest/tests/form_test.module +++ b/modules/simpletest/tests/form_test.module @@ -795,6 +795,15 @@ function form_label_test_form() { $form['form_textfield_test_title_no_show'] = array( '#type' => 'textfield', ); + // Test required checkboxes with #title_display attribute and a description. + $form['form_checkboxes_test_title_display_attribute'] = array( + '#type' => 'checkboxes', + '#title' => 'Checkboxes, #title_display attribute', + '#title_display' => 'attribute', + '#required' => TRUE, + '#description' => 'Required checkboxes with #title_display attribute and a description.', + '#options' => drupal_map_assoc(array('foo', 'bar', 'baz')), + ); return $form; } |