fixed incorrect use of username in unsub cta in emails

v1.18.x
Julian Lam 10 years ago
parent 463c893c3d
commit f168566928

@ -402,6 +402,7 @@ var db = require('./database'),
emailer.send('notif_chat', touid, {
subject: '[[email:notif.chat.subject, ' + messageObj.fromUser.username + ']]',
username: messageObj.toUser.username,
userslug: utils.slugify(messageObj.toUser.username),
summary: '[[notifications:new_message_from, ' + messageObj.fromUser.username + ']]',
message: messageObj,
site_title: meta.config.title || 'NodeBB',

@ -75,7 +75,7 @@ var async = require('async'),
Digest.send = function(data, callback) {
var now = new Date();
user.getMultipleUserFields(data.subscribers, ['uid', 'username', 'lastonline'], function(err, users) {
user.getMultipleUserFields(data.subscribers, ['uid', 'username', 'userslug', 'lastonline'], function(err, users) {
if (err) {
winston.error('[user/jobs] Could not send digests (' + data.interval + '): ' + err.message);
return callback(err);
@ -104,6 +104,7 @@ var async = require('async'),
emailer.send('digest', userObj.uid, {
subject: '[' + meta.config.title + '] Digest for ' + now.getFullYear()+ '/' + (now.getMonth()+1) + '/' + now.getDate(),
username: userObj.username,
userslug: userObj.userslug,
url: nconf.get('url'),
site_title: meta.config.title || meta.config.browserTitle || 'NodeBB',
notifications: notifications,

@ -40,5 +40,5 @@
<hr />
<p>
[[email:digest.unsub.info]] <a href="{url}/user/{username}/settings">[[email:unsub.cta]]</a>.
[[email:digest.unsub.info]] <a href="{url}/user/{userslug}/settings">[[email:unsub.cta]]</a>.
</p>

@ -28,4 +28,4 @@
===
[[email:digest.unsub.info]] [[email:unsub.cta]]: {url}/user/{username}/settings.
[[email:digest.unsub.info]] [[email:unsub.cta]]: {url}/user/{userslug}/settings.

@ -12,5 +12,5 @@
<hr />
<p>
[[email:notif.chat.unsub.info]] <a href="{url}/user/{username}/settings">[[email:unsub.cta]]</a>.
[[email:notif.chat.unsub.info]] <a href="{url}/user/{userslug}/settings">[[email:unsub.cta]]</a>.
</p>

@ -12,4 +12,4 @@
===
[[email:notif.chat.unsub.info]] <a href="{url}/user/{username}/settings">[[email:unsub.cta]]</a>.
[[email:notif.chat.unsub.info]] <a href="{url}/user/{userslug}/settings">[[email:unsub.cta]]</a>.

Loading…
Cancel
Save