GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

group private message email notification fix

Browse Source
This commit is contained in:
Evan Prodromou 2011-03-23 13:00:44 -04:00
parent 089c10d5d8
commit a221259328
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/GroupPrivateMessage/Group_message_profile.php
View File

@ -156,9 +156,7 @@ class Group_message_profile extends Memcached_DataObject
// TRANS: Subject for direct-message notification email. // TRANS: Subject for direct-message notification email.
// TRANS: %s is the sending user's nickname. // TRANS: %s is the sending user's nickname.
$subject = sprintf(_('New private message from %s to group %s'), $from->nickname, $group->nickname); $subject = sprintf(_('New private message from %s to group %s'), $from_profile->nickname, $group->nickname);
$from_profile = $from->getProfile();
// TRANS: Body for direct-message notification email. // TRANS: Body for direct-message notification email.
// TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname, // TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
@ -174,13 +172,13 @@ class Group_message_profile extends Memcached_DataObject
"With kind regards,\n". "With kind regards,\n".
"%6\$s\n"), "%6\$s\n"),
$from_profile->getBestName(), $from_profile->getBestName(),
$from->nickname, $from_profile->nickname,
$group->nickname, $group->nickname,
$this->content, $this->content,
common_local_url('newmessage', array('to' => $from->id)), common_local_url('newmessage', array('to' => $from_profile->id)),
common_config('site', 'name')); common_config('site', 'name'));
$headers = _mail_prepare_headers('message', $to->nickname, $from->nickname); $headers = _mail_prepare_headers('message', $to->nickname, $from_profile->nickname);
common_switch_locale(); common_switch_locale();