Merge branch 'diskcache' into 0.9.x

[quix0rs-gnu-social.git] / lib / mail.php

diff --git a/lib/mail.php b/lib/mail.php
index 472a88e061c117a21121ef70f0525b030a736f60..c724764cc8fc5f28cc35ca78bc6ebbc0e5a2e711 100644 (file)
--- 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);
 }
-