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

closes #2396

Browse Source
This commit is contained in:
barisusakli
2014-11-11 20:10:51 -05:00
parent fa5ac04cd3
commit 2579d2535d
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/topics.js
View File

@@ -69,7 +69,7 @@ var async = require('async'),
return callback(null, 1);
}
user.getSettings(uid, function(err, settings) {
if(err) {
if (err) {
return callback(err);
}
@@ -253,7 +253,7 @@ var async = require('async'),
Topics.addPostData(posts, uid, next);
});
});
},
},
category: async.apply(Topics.getCategoryData, tid),
threadTools: async.apply(plugins.fireHook, 'filter:topic.thread_tools', []),
tags: async.apply(Topics.getTopicTagsObjects, tid),

21
src/topics/create.js
View File

@@ -103,11 +103,14 @@ module.exports = function(Topics) {
if (!title || title.length < parseInt(meta.config.minimumTitleLength, 10)) {
return callback(new Error('[[error:title-too-short, ' + meta.config.minimumTitleLength + ']]'));
} else if(title.length > parseInt(meta.config.maximumTitleLength, 10)) {
} else if (title.length > parseInt(meta.config.maximumTitleLength, 10)) {
return callback(new Error('[[error:title-too-long, ' + meta.config.maximumTitleLength + ']]'));
}
async.waterfall([
function(next) {
checkContentLength(content, next);
},
function(next) {
categories.exists(cid, next);
},
@@ -220,11 +223,10 @@ module.exports = function(Topics) {
content = content.trim();
}
if (!content || content.length < parseInt(meta.config.miminumPostLength, 10)) {
return callback(new Error('[[error:content-too-short, ' + meta.config.minimumPostLength + ']]'));
}
posts.create({uid:uid, tid:tid, content:content, toPid:toPid}, next);
checkContentLength(content, next);
},
function(next) {
posts.create({uid: uid, tid: tid, content: content, toPid: toPid}, next);
},
function(data, next) {
postData = data;
@@ -277,4 +279,11 @@ module.exports = function(Topics) {
], callback);
};
function checkContentLength(content, callback) {
if (!content || content.length < parseInt(meta.config.miminumPostLength, 10)) {
return callback(new Error('[[error:content-too-short, ' + meta.config.minimumPostLength + ']]'));
}
callback();
}
};