Merge remote-tracking branch 'origin/master'

v1.18.x
barisusakli 11 years ago
commit b60ed95d20

@ -146,7 +146,7 @@ SocketPosts.sendNotificationToPostOwner = function(pid, fromuid, notification) {
async.parallel({ async.parallel({
username: async.apply(user.getUserField, fromuid, 'username'), username: async.apply(user.getUserField, fromuid, 'username'),
topicTitle: async.apply(topics.getTopicField, postData.tid, 'title'), topicTitle: async.apply(topics.getTopicField, postData.tid, 'title'),
postContent: async.apply(postTools.parse, postData.content) postContent: async.apply(postTools.parsePost, postData, postData.uid)
}, function(err, results) { }, function(err, results) {
if (err) { if (err) {
return; return;

Loading…
Cancel
Save