Merge remote-tracking branch 'upstream/master'

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index b4331f0926679a871249e83cdba43c4f5fdb5ed2..9c405c101b91623096045102fd2a332605cacbf0 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -310,7 +310,7 @@ function notification($params) {
 
        // send email notification if notification preferences permit
 
-       require_once('bbcode.php');
+       require_once('include/bbcode.php');
        if((intval($params['notify_flags']) & intval($params['type'])) || $params['type'] == NOTIFY_SYSTEM) {
 
                logger('notification: sending notification email');
@@ -471,8 +471,8 @@ class enotify {
                // generate a multipart/alternative message header
                $messageHeader =
                        $params['additionalMailHeader'] .
-                       "From: {$params['fromName']} <{$params['fromEmail']}>\n" . 
-                       "Reply-To: {$params['fromName']} <{$params['replyTo']}>\n" .
+                       "From: $fromName <{$params['fromEmail']}>\n" . 
+                       "Reply-To: $fromName <{$params['replyTo']}>\n" .
                        "MIME-Version: 1.0\n" .
                        "Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\"";
 
@@ -493,7 +493,7 @@ class enotify {
                // send the message
                $res = mail(
                        $params['toEmail'],                                                                             // send to address
-                       $params['messageSubject'],                                                              // subject
+                       $messageSubject,                                                                // subject
                        $multipartMessageBody,                                                  // message body
                        $messageHeader                                                                  // message headers
                );