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

Merge remote-tracking branch 'refs/remotes/origin/master' into develop

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-01-31 13:48:50 -05:00
parent 897a7d84f9 dd34fde7b5
commit b2cb3def98
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/groups/membership.js
View File

@@ -292,13 +292,7 @@ module.exports = function (Groups) {
async.each(groups, function (groupName, next) {
async.parallel([
function (next) {
Groups.isMember(uid, groupName, function (err, isMember) {
if (!err && isMember) {
Groups.leave(groupName, uid, next);
} else {
next();
}
});
Groups.leave(groupName, uid, next);
},
function (next) {
Groups.rejectMembership(groupName, uid, next);

3
src/notifications.js
View File

@@ -220,9 +220,10 @@ function pushToUids(uids, notification, callback) {
async.eachLimit(uids, 3, function (uid, next) {
emailer.send('notification', uid, {
path: notification.path,
subject: notification.subject || '[[notifications:new_notification_from, ' + meta.config.title + ']]',
subject: utils.stripHTMLTags(notification.subject || '[[notifications:new_notification_from, ' + meta.config.title + ']]'),
intro: utils.stripHTMLTags(notification.bodyShort),
body: utils.stripHTMLTags(notification.bodyLong || ''),
notification: notification,
showUnsubscribe: true,
}, next);
}, callback);