X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fmail.php;h=4e1f1dbb1d71ccee1d9407c591ae0c135de637c2;hb=4df1ea49ec75ec9dd64bc8f58c01e64ea18bedc7;hp=9fa86de5cc81a40643340db104248c79adb40c8e;hpb=2e221f5718c783cdb6b85d53570115e3d63c42ff;p=quix0rs-gnu-social.git

diff --git a/lib/mail.php b/lib/mail.php
index 9fa86de5cc..4e1f1dbb1d 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -50,10 +50,9 @@ function mail_backend()
     static $backend = null;
 
     if (!$backend) {
-        global $config;
-        $backend = Mail::factory($config['mail']['backend'],
-                                 ($config['mail']['params']) ?
-                                 $config['mail']['params'] :
+        $backend = Mail::factory(common_config('mail', 'backend'),
+                                 (common_config('mail', 'params')) ?
+                                 common_config('mail', 'params') :
                                  array());
         if (PEAR::isError($backend)) {
             common_server_error($backend->getMessage(), 500);
@@ -336,6 +335,7 @@ function mail_broadcast_notice_sms($notice)
                  "FROM $UT JOIN subscription " .
                  "ON $UT.id = subscription.subscriber " .
                  'WHERE subscription.subscribed = ' . $notice->profile_id . ' ' .
+                 'AND subscription.subscribed != subscription.subscriber ' .
                  "AND $UT.smsemail IS NOT null " .
                  "AND $UT.smsnotify = 1 " .
                  'AND subscription.sms = 1 ');
@@ -555,17 +555,19 @@ function mail_notify_fave($other, $user, $notice)
 
     $body = sprintf(_("%1\$s just added your notice from %2\$s".
                       " as one of their favorites.\n\n" .
-                      "In case you forgot, you can see the text".
-                      " of your notice here:\n\n" .
+                      "The URL of your notice is:\n\n" .
                       "%3\$s\n\n" .
-                      "You can see the list of %1\$s's favorites here:\n\n" .
+                      "The text of your notice is:\n\n" .
                       "%4\$s\n\n" .
+                      "You can see the list of %1\$s's favorites here:\n\n" .
+                      "%5\$s\n\n" .
                       "Faithfully yours,\n" .
-                      "%5\$s\n"),
+                      "%6\$s\n"),
                     $bestname,
                     common_exact_date($notice->created),
                     common_local_url('shownotice',
                                      array('notice' => $notice->id)),
+                    $notice->content,
                     common_local_url('showfavorites',
                                      array('nickname' => $user->nickname)),
                     common_config('site', 'name'));