Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-01 00:38:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

unescape email subject

Browse Source
This commit is contained in:
Baris Usakli
2018-12-05 17:38:08 -05:00
parent 6df5668e64
commit 96c1dc6276
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/language/en-GB/notifications.json
View File

@@ -9,8 +9,7 @@
"outgoing_link_message": "You are now leaving %1",
"continue_to": "Continue to %1",
"return_to": "Return to %1",
"new_notification": "New Notification",
"new_notification_from": "You have a new Notification from %1",
"new_notification": "You have a new notification",
"you_have_unread_notifications": "You have unread notifications.",
"all": "All",

2
src/emailer.js
View File

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

2
src/notifications.js
View File

@@ -243,7 +243,7 @@ function pushToUids(uids, notification, callback) {
async.eachLimit(uids, 3, function (uid, next) {
emailer.send('notification', uid, {
path: notification.path,
subject: utils.stripHTMLTags(notification.subject || '[[notifications:new_notification_from, ' + meta.config.title + ']]'),
subject: utils.stripHTMLTags(notification.subject || '[[notifications:new_notification]]'),
intro: utils.stripHTMLTags(notification.bodyShort),
body: notification.bodyLong || '',
notification: notification,