diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-10 14:18:54 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-10 14:18:54 -0800 |
| commit | 15b88697a7c182faead1bbddfe38b59fdc54a0a2 (patch) | |
| tree | 69b41257e797a7919ffa8ee77619805957d0abe8 /lib/mail.php | |
| parent | 866dfa6822df54765a9b92336722d86cfad6b123 (diff) | |
| parent | 63eddf216fac848aa2b7afbbafb0fcc4bf8b7d79 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/mail.php')
| -rw-r--r-- | lib/mail.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/mail.php b/lib/mail.php index 472a88e06..c724764cc 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -251,11 +251,11 @@ function mail_subscribe_notify_profile($listenee, $other) common_config('site', 'name'), $other->profileurl, ($other->location) ? - sprintf(_("Location: %s\n"), $other->location) : '', + sprintf(_("Location: %s"), $other->location) . "\n" : '', ($other->homepage) ? - sprintf(_("Homepage: %s\n"), $other->homepage) : '', + sprintf(_("Homepage: %s"), $other->homepage) . "\n" : '', ($other->bio) ? - sprintf(_("Bio: %s\n\n"), $other->bio) : '', + sprintf(_("Bio: %s"), $other->bio) . "\n\n" : '', common_config('site', 'name'), common_local_url('emailsettings')); @@ -652,4 +652,3 @@ function mail_notify_attn($user, $notice) common_init_locale(); mail_to_user($user, $subject, $body); } - |