? .svn
? token.patch
? token_comment.patch
? translations/.svn
Index: token_comment.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/token/token_comment.inc,v
retrieving revision 1.3.4.3
diff -u -p -r1.3.4.3 token_comment.inc
--- token_comment.inc	14 Jul 2008 16:07:04 -0000	1.3.4.3
+++ token_comment.inc	19 May 2009 23:12:00 -0000
@@ -35,6 +35,19 @@ function comment_token_values($type, $ob
       $values['comment-title-raw']       = $comment->subject;
       $values['comment-body-raw']        = $comment->comment;
       $values['comment-author-name-raw'] = $comment->name;
+      $values['comment-homepage-raw']    = $comment->homepage;
+      
+      if (!empty($comment->mail)) {
+        $account_mail = $comment->mail;
+      }
+      elseif (!empty($comment->uid)) {
+        $account_mail = db_result(db_query("SELECT mail FROM {users} WHERE uid = %d", $comment->uid));
+      }
+      else {
+        $account_mail = '';
+      }
+      $values['comment-author-mail']      = check_plain($account_mail);
+      $values['comment-author-mail-raw']  = $account_mail;
 
       // Included in case a consuming module wants to format the body
       $values['comment-body-format']     = $comment->format;
@@ -72,6 +85,10 @@ function comment_token_list($type = 'all
     $tokens['comment']['comment-author-uid']      = t("Comment author's user id");
     $tokens['comment']['comment-author-name']     = t("Comment author's user name");
     $tokens['comment']['comment-author-name-raw'] = t("Comment author's user name. WARNING - raw user input");
+    $tokens['comment']['comment-homepage-raw']    = t("Comment user's home page. WARNING - raw user input");
+
+    $tokens['comment']['comment-author-mail']     = t("Comment author's e-mail.");
+    $tokens['comment']['comment-author-mail-raw'] = t("Comment author's e-mail. WARNING - raw user input.");
 
     $tokens['comment']['comment-yyyy']            = t("Comment creation year (four digit)");
     $tokens['comment']['comment-yy']              = t("Comment creation year (two digit)");