Index: akismet.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/akismet/akismet.module,v
retrieving revision 1.11
diff -u -w -r1.11 akismet.module
--- akismet.module      1 Jan 2007 21:40:03 -0000       1.11
+++ akismet.module      12 Feb 2007 17:24:04 -0000
@@ -932,39 +932,39 @@
     }
     $message_args = array(
       '@title-label' => t('Subject'),
-      '%content-title' => check_plain($content->subject),
-      '%content-type' => t('comment'),
-      '%content-link' => url('node/'. $content->nid, NULL, 'comment-'. $content->cid, TRUE)
+      '@content-title' => $content->subject,
+      '@content-type' => t('comment'),
+      '@content-link' => url('node/'. $content->nid, NULL, 'comment-'. $content->cid, TRUE)
     );
-    $message_title = t('[%site-name] moderator notification - Posted comment on \'@title\'', array('%site-name' => $site_name, '@title' => check_plain($node->title)));
+    $message_title = t('[@site-name] moderator notification - Posted comment on \'@title\'', array('@site-name' => $site_name, '@title' => $node->title));
   }
   else {
     $message_args = array(
       '@title-label' => t('Title'),
-      '%content-title' => check_plain($content->title),
-      '%content-type' => check_plain($moderator_types[$content->type]),
-      '%content-link' => url('node/'. $content->nid, NULL, NULL, TRUE)
+      '@content-title' => $content->title,
+      '@content-type' => $moderator_types[$content->type],
+      '@content-link' => url('node/'. $content->nid, NULL, NULL, TRUE)
     );
-    $message_title = t('[%site-name] moderator notification - Posted %type \'@title\'', array('%site-name' => $site_name, '%type' => check_plain($moderator_types[$content->type]), '@title' => check_plain($content->title)));
+    $message_title = t('[@site-name] moderator notification - Posted @type \'@title\'', array('@site-name' => $site_name, '@type' => $moderator_types[$content->type], '@title' => $content->title));
   }
-  $message_args['%content-status'] = ($is_published ? t('published') : t('published')) . ($is_spam ? ' ('. t('marked as spam') .')' : '');
-  $message_args['%site-name'] = check_plain($site_name);
-  $message_args['%site-link'] = $base_url . base_path();
+  $message_args['@content-status'] = ($is_published ? t('published') : t('published')) . ($is_spam ? ' ('. t('marked as spam') .')' : '');
+  $message_args['@site-name'] = $site_name;
+  $message_args['@site-link'] = $base_url . base_path();

   $message_body = t(<<<EOT
-Hello %user-name,
+Hello @user-name,

-You can use the following information to review this %content-type:
+You can use the following information to review this @content-type:

-@title-label: %content-title
-URL: %content-link
-Status: %content-status
+@title-label: @content-title
+URL: @content-link
+Status: @content-status

-Please, do not reply to this e-mail. It is an automated notification you are receiving because you are a moderator at %site-name. If you no longer wish to receive such notifications, you can change your moderator settings in your user profile.
+Please, do not reply to this e-mail. It is an automated notification you are receiving because you are a moderator at @site-name. If you no longer wish to receive such notifications, you can change your moderator settings in your user profile.

 Thank you

-%site-link
+@site-link
 EOT
   , $message_args);

@@ -972,16 +972,13 @@
   watchdog('akismet', t('Trying to notify the following recipients: %emails', array('%emails' => implode(', ', array_keys($unique_emails)))));

   // Send e-mails.
-  $site_mail = variable_get('site_mail', ini_get('sendmail_from'));
-  $headers = "From: $site_mail\nReply-to: $site_mail\nX-Mailer: Drupal\nReturn-path: $site_mail\nErrors-to: $site_mail";
   foreach ($unique_emails as $email_to => $uid) {
     drupal_mail(
       'akismet_moderator_notification',
       $email_to,
       $message_title,
-      str_replace('%user-name', check_plain($moderators[$uid]['name']), $message_body),
-      variable_get('site_mail', ''),
-      $headers
+      str_replace('@user-name', check_plain($moderators[$uid]['name']), $message_body),
+      variable_get('site_mail', ini_get('sendmail_from'))
     );
   }
 }
@@ -1280,7 +1277,7 @@
       }

       // Record the event to watchdog.
-      watchdog('content', t('%type: deleted @title.', array('%type' => theme('placeholder', t($node->type)), '@title' => theme('placeholder', $node->title))));
+      watchdog('content', t('%type: deleted %title.', array('%type' => t($node->type), '%title' => $node->title)));
       return TRUE;
     }
   }
@@ -1404,7 +1401,7 @@

     if ($log_action) {
       $action = ($op == 'publish' ? t('Comment published') : t('Comment unpublished'));
-      watchdog('content', t('@action: %subject', array('@action' => $action, '%subject' => theme('placeholder', $content->subject))), WATCHDOG_NOTICE, l(t('view'), 'node/'. $content->nid, NULL, NULL, 'comment-'. $content->cid));
+      watchdog('content', t('@action: %subject', array('@action' => $action, '%subject' => $content->subject)), WATCHDOG_NOTICE, l(t('view'), 'node/'. $content->nid, NULL, NULL, 'comment-'. $content->cid));
     }
   }