- Patch #240873 by Gábor Hojtsy: move custom help settings to blocks. Very exciting.

3 files changed, 1 insertions, 14 deletions

diff --git a/modules/contact/contact.admin.inc b/modules/contact/contact.admin.inc
index 6fa4404f0..624c01cbf 100644
--- a/modules/contact/contact.admin.inc
+++ b/modules/contact/contact.admin.inc
@@ -164,11 +164,6 @@ function contact_admin_delete_submit($form, &$form_state) {
 }
 
 function contact_admin_settings() {
-  $form['contact_form_information'] = array('#type' => 'textarea',
-    '#title' => t('Additional information'),
-    '#default_value' => t('You can leave a message using the contact form below.'),
-    '#description' => t('Information to show on the <a href="@form">contact page</a>. Can be anything from submission guidelines to your postal address or telephone number.', array('@form' => url('contact'))),
-  );
   $form['contact_hourly_threshold'] = array('#type' => 'select',
     '#title' => t('Hourly threshold'),
     '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 20, 30, 40, 50)),
diff --git a/modules/contact/contact.pages.inc b/modules/contact/contact.pages.inc
index 2984b0d53..65ac85a4f 100644
--- a/modules/contact/contact.pages.inc
+++ b/modules/contact/contact.pages.inc
@@ -47,9 +47,6 @@ function contact_mail_page() {
   }
 
   $form['#token'] = $user->uid ? $user->name . $user->mail : '';
-  $form['contact_information'] = array(
-    '#markup' => filter_xss_admin(variable_get('contact_form_information', t('You can leave a message using the contact form below.'))),
-  );
   $form['name'] = array(
     '#type' => 'textfield',
     '#title' => t('Your name'),
diff --git a/modules/contact/contact.test b/modules/contact/contact.test
index 692b3c752..ae5fbe1ec 100644
--- a/modules/contact/contact.test
+++ b/modules/contact/contact.test
@@ -27,8 +27,6 @@ class ContactSitewideTestCase extends DrupalWebTestCase {
 
     // Set settings.
     $edit = array();
-    $contact_form_information = $this->randomName(100);
-    $edit['contact_form_information'] = $contact_form_information;
     $edit['contact_hourly_threshold'] = 3;
     $edit['contact_default_status'] = TRUE;
     $this->drupalPost('admin/build/contact/settings', $edit, t('Save configuration'));
@@ -82,7 +80,7 @@ class ContactSitewideTestCase extends DrupalWebTestCase {
     $this->setPermission('anonymous user', array('access site-wide contact form' => TRUE));
     $this->drupalLogout();
     $this->drupalGet('contact');
-    $this->assertText($contact_form_information, t('Contact form is shown when there is one category.'));
+    $this->assertText(t('Contact'), t('Contact form is shown when there is one category.'));
     $this->assertNoText(t('Category'), t('When there is only one category, the category selection element is hidden.'));
     $this->drupalLogin($admin_user);
 
@@ -113,9 +111,6 @@ class ContactSitewideTestCase extends DrupalWebTestCase {
     $this->drupalGet('contact');
     $this->assertResponse(200, t('Access granted to anonymous user with permission.'));
 
-    // Check that "Additional information" is displayed on the page.
-    $this->assertText($edit['contact_form_information'], t('Contact information displayed.'));
-
     // Submit contact form with invalid values.
     $this->submitContact('', $recipients[0], $this->randomName(16), $categories[0], $this->randomName(64));
     $this->assertText(t('Your name field is required.'), t('Name required.'));