back out my change to the link format; see if it helps

[quix0rs-gnu-social.git] / actions / subscribe.php

diff --git a/actions/subscribe.php b/actions/subscribe.php
index 4a17e302f431300005a39066ebc8d621a191cf5b..43506a593dd7d1eca17e65011a373aac27209fa9 100644 (file)
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -73,7 +73,7 @@ class SubscribeAction extends Action {
        }
 
        function notify_email($listenee, $listener) {
-               if ($listenee->email) {
+               if ($listenee->email && $listenee->emailnotifysub) {
                        $profile = $listenee->getProfile();
                        $other = $listener->getProfile();
                        $name = $profile->getBestName();
@@ -83,10 +83,13 @@ class SubscribeAction extends Action {
                        $headers['To'] = $name . ' <' . $listenee->email . '>';
                        $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.\n\n".
-                                                          "\t3$s\n\n".
-                                                          "Faithfully yours,\n%2$s\n"), $long_name, common_config('site', 'name'), $other->profileurl);
-
+                       $body  = sprintf(_('%1$s is now listening to your notices on %2$s.'."\n\n".
+                                                          "\t".'%3$s'."\n\n".
+                                                          'Faithfully yours,'."\n".'%4$s.'."\n"),
+                                                        $long_name,
+                                                        common_config('site', 'name'), 
+                                                        $other->profileurl,
+                                                        common_config('site', 'name'));
                        mail_send($recipients, $headers, $body);
                }
        }