Index: mail_edit.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mail_edit/mail_edit.module,v
retrieving revision 1.1
diff -u -r1.1 mail_edit.module
--- mail_edit.module	5 Dec 2007 16:46:27 -0000	1.1
+++ mail_edit.module	7 Dec 2007 03:31:02 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: mail_edit.module,v 1.1 2007/12/05 16:46:27 chx Exp $
+// $Id: mail_edit.module,v 1.1.2.15 2007/10/01 18:50:47 chx Exp $
 
 function mail_edit_menu($may_cache) {
   $items = array();
@@ -54,6 +54,7 @@
     $variables['!sender_name'] = $sender->name;
     $variables['!sender_page'] = url("user/$sender->uid", NULL, NULL, TRUE);
     $variables['!sender_contact_page'] = (empty($sender->contact) ? '(disabled)' : url("user/$sender->uid/contact", NULL, NULL, TRUE));
+    $variables['!sender_has_contact_page'] = (empty($sender->contact) ? 0 : 1);
     if ($recipient) {
       $variables['!recipient_name'] = $recipient->name;
       $variables['!recipient_page'] = url("user/$recipient->uid", NULL, NULL, TRUE);
@@ -69,11 +70,11 @@
       $function($variables, $mailkey, $sender, $recipient);
     }
     if ($alter->subject) {
-      subscriptions_template_preprocess($alter->subject, $variables);
+      $alter->subject = subscriptions_template_preprocess($alter->subject, $variables);
       $subject = strtr($alter->subject, $variables);
     }
     if ($alter->body) {
-      subscriptions_template_preprocess($alter->body, $variables);
+      $alter->body = subscriptions_template_preprocess($alter->body, $variables);
       $body = strtr($alter->body, $variables);
     }
     if ($is_privatemsg) {
@@ -163,11 +164,12 @@
   $form['help'] = array(
     '#theme' => 'mail_edit_variables',
     '#variables' => array(
-      '!recipient_name' => t('Name of the recipient.'),
-      '!recipient_page' => ('The user page of the recipient.'),
-      '!sender_name' => t('Name of the sender.'),
+      '!recipient_name' => t('The name of the recipient.'),
+      '!recipient_page' => t('The user page of the recipient.'),
+      '!sender_name' => t('The name of the sender.'),
       '!sender_page' => t('The user page of the sender.'),
       '!sender_contact_page' => t('The contact page of the sender.'),
+      '!sender_has_contact_page' => t("The status of the sender's contact page: 1 = enabled, 0 = disabled."),
     ),
     '#weight' => 30,
   );