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

fixup name sent in subject of confirmation email

Browse Source 
darcs-hash:20080712202017-84dde-db9bb7d4db42514215cccf76f12ffae4f853dbdc.gz
This commit is contained in:
Evan Prodromou 2008-07-12 16:20:17 -04:00
parent fd39937f0b
commit 24e865aa72
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
actions/subscribe.php
View File

@ -74,7 +74,6 @@ class SubscribeAction extends Action {
function notify_email($listenee, $listener) { function notify_email($listenee, $listener) {
if ($listenee->email) { if ($listenee->email) {
global $config;
$profile = $listenee->getProfile(); $profile = $listenee->getProfile();
$other = $listener->getProfile(); $other = $listener->getProfile();
$name = $profile->getBestName(); $name = $profile->getBestName();
@ -82,9 +81,9 @@ class SubscribeAction extends Action {
$recipients = $listenee->email; $recipients = $listenee->email;
$headers['From'] = mail_notify_from(); $headers['From'] = mail_notify_from();
$headers['To'] = $name . ' <' . $listenee->email . '>'; $headers['To'] = $name . ' <' . $listenee->email . '>';
$headers['Subject'] = sprintf(_('%1$s is now listening to your notices on %2$s.'), $name, $config['site']['name']); $headers['Subject'] = sprintf(_('%1$s is now listening to your notices on %2$s.'), $other->getBestName(),
common_config('site', 'name'));
$body = sprintf(_('%1$s is now listening to your notices on %2$s.'), $long_name, $config['site']['name']); $body = sprintf(_('%1$s is now listening to your notices on %2$s.'), $long_name, common_config('site', 'name'));
$body .= "\n\n"; $body .= "\n\n";
$body .= "\t".$other->profileurl; $body .= "\t".$other->profileurl;
$body .= "\n\n"; $body .= "\n\n";