Index: modules/contact.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact.module,v
retrieving revision 1.18
diff -u -r1.18 contact.module
--- modules/contact.module	27 Jun 2005 18:33:32 -0000	1.18
+++ modules/contact.module	30 Jul 2005 02:07:28 -0000
@@ -58,7 +58,8 @@
  * Implementation of hook_settings().
  */
 function contact_settings() {
-  $output = form_textarea(t('Additional information'), 'contact_form_information', variable_get('contact_form_information', t('You can leave us a message using the contact form below.')), 60, 5, 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'))));
+  $output  = form_textarea(t('Additional information'), 'contact_form_information', variable_get('contact_form_information', t('You can leave us a message using the contact form below.')), 60, 5, 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'))));
+  $output .= filter_form('contact_form_information_filter');
   return $output;
 }
 
@@ -294,7 +295,7 @@
     }
 
     if ($subjects) {
-      $output  = variable_get('contact_form_information', t('You can leave us a message using the contact form below.'));
+      $output  = check_markup(variable_get('contact_form_information', t('You can leave us a message using the contact form below.')), variable_get('contact_form_information_filter', NULL), FALSE);
       $output .= form_textfield(t('Name'), 'name', $edit['name'], 60, 255, NULL, NULL, TRUE);
       $output .= form_textfield(t('E-mail'), 'mail', $edit['mail'], 60, 255, NULL, NULL, TRUE);
       $output .= form_select(t('Subject'), 'subject', $edit['subject'], $subjects, NULL, NULL, NULL, TRUE);