deleted my comment of the original line

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index 8b5002cb2a75791f16cd90a74e5953739d4fd8ee..7d862190590b93e40bf359cb13ce692fe26cfd7a 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -27,8 +27,11 @@ function notification($params) {
        $hostname = $a->get_hostname();
        if(strpos($hostname,':'))
                $hostname = substr($hostname,0,strpos($hostname,':'));
-
-       $sender_email = t('noreply') . '@' . $hostname;
+       
+       $sender_email = $a->config['sender_email'];
+       if (empty($sender_email)) {
+               $sender_email = t('noreply') . '@' . $hostname;
+       }
 
        $user = q("SELECT `nickname` FROM `user` WHERE `uid` = %d", intval($params['uid']));
        if ($user)
@@ -598,6 +601,7 @@ function notification($params) {
                // use the Emailer class to send the message
 
                return Emailer::send(array(
+                       'uid' => $params['uid'],
                        'fromName' => $sender_name,
                        'fromEmail' => $sender_email,
                        'replyTo' => $sender_email,