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

Merge branch 'master' of https://github.com/designcreateplay/NodeBB

Browse Source
This commit is contained in:
Baris Usakli
2013-08-27 15:55:48 -04:00
parent 6a08fedf18 97641dbcda
commit c262027728
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/topics.js
View File

@@ -561,20 +561,22 @@ var RDB = require('./redis.js')
return callback(err, null); return callback(err, null);
var stripped = postData.content, var stripped = postData.content,
timestamp = postData.timestamp; timestamp = postData.timestamp,
returnObj = {
"username": userData.username,
"picture": userData.picture,
"timestamp" : timestamp
};
if(postData.content) { if (postData.content) {
stripped = postData.content.replace(/>.+\n\n/, ''); stripped = postData.content.replace(/>.+\n\n/, '');
postTools.toHTML(stripped, function(err, stripped) { postTools.toHTML(stripped, function(err, stripped) {
stripped = utils.strip_tags(stripped); returnObj.text = utils.strip_tags(stripped);
callback(null, returnObj);
callback(null, {
"text": stripped,
"username": userData.username,
"picture": userData.picture,
"timestamp" : timestamp
});
}); });
} else {
returnObj.text = '';
callback(null, returnObj);
} }
}); });
}); });

2
src/user.js
View File

@@ -3,7 +3,7 @@ var utils = require('./../public/src/utils.js'),
crypto = require('crypto'), crypto = require('crypto'),
emailjs = require('emailjs'), emailjs = require('emailjs'),
meta = require('./meta.js'), meta = require('./meta.js'),
emailjsServer = emailjs.server.connect(meta.config.mailer), emailjsServer = emailjs.server.connect(meta.config.mailer || '127.0.0.1'),
bcrypt = require('bcrypt'), bcrypt = require('bcrypt'),
notifications = require('./notifications.js'), notifications = require('./notifications.js'),
topics = require('./topics.js'), topics = require('./topics.js'),