Merge branch 'nightly' into 'nightly'

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

diff --git a/lib/mail.php b/lib/mail.php
index 428f87638308928d3baa473196077caa420dbd14..497637eb444b9379125406f212213f2193728a4e 100644 (file)
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -199,8 +199,7 @@ function mail_subscribe_notify_profile($listenee, $other)
 
         $name = $profile->getBestName();
 
-        $long_name = ($other->fullname) ?
-          ($other->fullname . ' (' . $other->nickname . ')') : $other->nickname;
+        $long_name = $other->getFancyName();
 
         $recipients = $listenee->email;