From 2661a31227c54c6a2716f2d41d4ff644a3652a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 29 Dec 2017 13:27:07 -0500 Subject: [PATCH] closes #6202 --- src/notifications.js | 2 +- src/topics/follow.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/notifications.js b/src/notifications.js index 6a7940d50d..4bf9782e61 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -220,7 +220,7 @@ function pushToUids(uids, notification, callback) { async.eachLimit(uids, 3, function (uid, next) { emailer.send('notification', uid, { path: notification.path, - subject: '[[notifications:new_notification_from, ' + meta.config.title + ']]', + subject: notification.subject || '[[notifications:new_notification_from, ' + meta.config.title + ']]', intro: utils.stripHTMLTags(notification.bodyShort), body: utils.stripHTMLTags(notification.bodyLong || ''), showUnsubscribe: true, diff --git a/src/topics/follow.js b/src/topics/follow.js index cf8754bcc5..aad9c0f079 100644 --- a/src/topics/follow.js +++ b/src/topics/follow.js @@ -9,6 +9,7 @@ var notifications = require('../notifications'); var privileges = require('../privileges'); var plugins = require('../plugins'); var utils = require('../utils'); +var meta = require('../meta'); module.exports = function (Topics) { Topics.toggleFollow = function (tid, uid, callback) { @@ -219,6 +220,7 @@ module.exports = function (Topics) { notifications.create({ type: 'new-reply', + subject: '[' + (meta.config.title || 'NodeBB') + '] ' + title, bodyShort: '[[notifications:user_posted_to, ' + postData.user.username + ', ' + titleEscaped + ']]', bodyLong: postData.content, pid: postData.pid,