Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-08 23:15:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes #6371

Browse Source
This commit is contained in:
Julian Lam
2018-03-20 08:41:49 -04:00
parent eaae5b52cd
commit 9e44fc6ae2
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/emailer.js
View File

@@ -229,7 +229,7 @@ Emailer.sendToEmail = function (template, email, language, params, callback) {
to: email, to: email,
from: meta.config['email:from'] || 'no-reply@' + getHostname(), from: meta.config['email:from'] || 'no-reply@' + getHostname(),
from_name: meta.config['email:from_name'] || 'NodeBB', from_name: meta.config['email:from_name'] || 'NodeBB',
subject: results.subject, subject: '[' + meta.config.title + '] ' + results.subject,
html: results.html, html: results.html,
plaintext: htmlToText.fromString(results.html, { plaintext: htmlToText.fromString(results.html, {
ignoreImage: true, ignoreImage: true,

3
src/socket.io/admin.js
View File

@@ -228,9 +228,8 @@ SocketAdmin.settings.clearSitemapCache = function (socket, data, callback) {
}; };
SocketAdmin.email.test = function (socket, data, callback) { SocketAdmin.email.test = function (socket, data, callback) {
var site_title = meta.config.title || 'NodeBB';
var payload = { var payload = {
subject: '[' + site_title + '] Test Email', subject: 'Test Email',
}; };
switch (data.template) { switch (data.template) {

2
src/user/digest.js
View File

@@ -134,7 +134,7 @@ Digest.send = function (data, callback) {
}); });
emailsSent += 1; emailsSent += 1;
emailer.send('digest', userObj.uid, { emailer.send('digest', userObj.uid, {
subject: '[' + meta.config.title + '] [[email:digest.subject, ' + (now.getFullYear() + '/' + (now.getMonth() + 1) + '/' + now.getDate()) + ']]', subject: '[[email:digest.subject, ' + (now.getFullYear() + '/' + (now.getMonth() + 1) + '/' + now.getDate()) + ']]',
username: userObj.username, username: userObj.username,
userslug: userObj.userslug, userslug: userObj.userslug,
notifications: notifications, notifications: notifications,