HTML output in RSS 2.0 and Atom

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

diff --git a/lib/mail.php b/lib/mail.php
index a4764bfb5491443e5b55f13a9a69b8c4c20bac2e..4c73a0b7bed39d0bda38ed687e68e2270363ddc5 100644 (file)
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -157,7 +157,7 @@ function mail_new_incoming_notify($user) {
 }
 
 function mail_new_incoming_address() {
-       $prefix = common_good_rand(8);
+       $prefix = common_confirmation_code(64);
        $suffix = mail_domain();
        return $prefix . '@' . $suffix;
 }
@@ -240,14 +240,14 @@ function mail_notify_nudge($from, $to) {
        $from_profile = $from->getProfile();
 
        $body = sprintf(_("%1\$s (%2\$s) is wondering what you are up to these days and is inviting you to post some news.\n\n".
-                                         "You can reply to their message here:\n\n".
+                                         "So let's hear from you :)\n\n".
                                          "%3\$s\n\n".
                                          "Don't reply to this email; it won't get to them.\n\n".
                                          "With kind regards,\n".
                                          "%4\$s\n"),
                                        $from_profile->getBestName(),
                                        $from->nickname,
-                                       common_local_url('newmessage', array('to' => $from->id)),
+                                       common_local_url('all', array('nickname' => $to->nickname)),
                                        common_config('site', 'name'));
 
        return mail_to_user($to, $subject, $body);