bug 1770 conversation link for email
This commit is contained in:
parent
11086c7823
commit
145bb28baf
40
lib/mail.php
40
lib/mail.php
|
@ -596,32 +596,44 @@ function mail_notify_attn($user, $notice)
|
||||||
$bestname = $sender->getBestName();
|
$bestname = $sender->getBestName();
|
||||||
|
|
||||||
common_init_locale($user->language);
|
common_init_locale($user->language);
|
||||||
|
|
||||||
|
if ($notice->conversation != $notice->id) {
|
||||||
|
$conversationEmailText = "The full conversation can be read here:\n\n".
|
||||||
|
"\t%5\$s\n\n ";
|
||||||
|
$conversationUrl = common_local_url('conversation',
|
||||||
|
array('id' => $notice->conversation)).'#notice-'.$notice->id;
|
||||||
|
} else {
|
||||||
|
$conversationEmailText = "%5\$s";
|
||||||
|
$conversationUrl = null;
|
||||||
|
}
|
||||||
|
|
||||||
$subject = sprintf(_('%s sent a notice to your attention'), $bestname);
|
$subject = sprintf(_('%s sent a notice to your attention'), $bestname);
|
||||||
|
|
||||||
$body = sprintf(_("%1\$s just sent a notice to your attention (an '@-reply') on %2\$s.\n\n".
|
$body = sprintf(_("%1\$s just sent a notice to your attention (an '@-reply') on %2\$s.\n\n".
|
||||||
"The notice is here:\n\n".
|
"The notice is here:\n\n".
|
||||||
"\t%3\$s\n\n" .
|
"\t%3\$s\n\n" .
|
||||||
"It reads:\n\n".
|
"It reads:\n\n".
|
||||||
"\t%4\$s\n\n" .
|
"\t%4\$s\n\n" .
|
||||||
|
$conversationEmailText .
|
||||||
"You can reply back here:\n\n".
|
"You can reply back here:\n\n".
|
||||||
"\t%5\$s\n\n" .
|
"\t%6\$s\n\n" .
|
||||||
"The list of all @-replies for you here:\n\n" .
|
"The list of all @-replies for you here:\n\n" .
|
||||||
"%6\$s\n\n" .
|
"%7\$s\n\n" .
|
||||||
"Faithfully yours,\n" .
|
"Faithfully yours,\n" .
|
||||||
"%2\$s\n\n" .
|
"%2\$s\n\n" .
|
||||||
"P.S. You can turn off these email notifications here: %7\$s\n"),
|
"P.S. You can turn off these email notifications here: %8\$s\n"),
|
||||||
$bestname,
|
$bestname,//%1
|
||||||
common_config('site', 'name'),
|
common_config('site', 'name'),//%2
|
||||||
common_local_url('shownotice',
|
common_local_url('shownotice',
|
||||||
array('notice' => $notice->id)),
|
array('notice' => $notice->id)),//%3
|
||||||
$notice->content,
|
$notice->content,//%4
|
||||||
|
$conversationUrl,//%5
|
||||||
common_local_url('newnotice',
|
common_local_url('newnotice',
|
||||||
array('replyto' => $sender->nickname)),
|
array('replyto' => $sender->nickname)),//%6
|
||||||
common_local_url('replies',
|
common_local_url('replies',
|
||||||
array('nickname' => $user->nickname)),
|
array('nickname' => $user->nickname)),//%7
|
||||||
common_local_url('emailsettings'));
|
common_local_url('emailsettings'));//%8
|
||||||
|
|
||||||
common_init_locale();
|
common_init_locale();
|
||||||
mail_to_user($user, $subject, $body);
|
mail_to_user($user, $subject, $body);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user