### Eclipse Workspace Patch 1.0
#P drupal-7
Index: includes/mail.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/mail.inc,v
retrieving revision 1.32
diff -u -r1.32 mail.inc
--- includes/mail.inc	17 Jun 2010 13:16:57 -0000	1.32
+++ includes/mail.inc	18 Jun 2010 19:56:03 -0000
@@ -53,12 +53,14 @@
  *   }
  *
  *   function example_mail($key, &$message, $params) {
- *     $language = $message['language'];
- *     $variables = user_mail_tokens($params['account'], $language);
+ *     $data['user'] = $params['account'];
+ *     $options['language'] = $message['language'];
+ *     user_mail_tokens($variables, $data, $options);
  *     switch($key) {
  *       case 'notice':
- *         $message['subject'] = t('Notification from !site', $variables, $language->language);
- *         $message['body'][] = t("Dear !username\n\nThere is new content available on the site.", $variables, $language->language);
+ *         $langcode = $message['language']->language;
+ *         $message['subject'] = t('Notification from !site', $variables, array('langcode' => $langcode));
+ *         $message['body'][] = t("Dear !username\n\nThere is new content available on the site.", $variables, array('langcode' => $langcode));
  *         break;
  *     }
  *   }