From 4914ff1cc06cfd9f15662388c1c4970a89f26c68 Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Sun, 25 Mar 2012 10:29:17 -0600
Subject: [PATCH] Revert "Issue #1475666 by filijonka, Devin Carlson, Kevin
 Morse, tstoeckler, Niklas Fiekas: Fixed PHP error because of typo in form.inc
 line 3025."

This reverts commit c804c2bc6737f406eafd3ead3551ac32c402b7f7.
---
 core/includes/form.inc                         | 2 +-
 core/modules/simpletest/tests/form.test        | 5 -----
 core/modules/simpletest/tests/form_test.module | 9 ---------
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/core/includes/form.inc b/core/includes/form.inc
index c3571f4e527..c1d48e39243 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -3094,7 +3094,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/core/modules/simpletest/tests/form.test b/core/modules/simpletest/tests/form.test
index 582b473b50f..39463740109 100644
--- a/core/modules/simpletest/tests/form.test
+++ b/core/modules/simpletest/tests/form.test
@@ -740,11 +740,6 @@ 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/core/modules/simpletest/tests/form_test.module b/core/modules/simpletest/tests/form_test.module
index ef553e40173..4b0f2954726 100644
--- a/core/modules/simpletest/tests/form_test.module
+++ b/core/modules/simpletest/tests/form_test.module
@@ -821,15 +821,6 @@ 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;
 }