Merge commit '0852c32b' into SANDBOX

app/controllers/mobile/forumThread.js

@@ -58,7 +58,14 @@ function create(req, callback) {
         entity.images = array;
     }
     //-----------处理前端上传图片结束
-    if (entity.pid && entity.type == 3) {
+
+    //校验是否全是表情
+    var temp_content = entity.content;
+    temp_content = temp_content.replace(/<img\/?.+?border="0">/g,"");
+
+    if(!temp_content || temp_content.length < 1){
+        callback('content error', null);
+    } else if (entity.pid && entity.type == 3) {
         forumThreadService.getByConditions({
             type: 3,
             level: '2',
@@ -330,7 +337,7 @@ router.post('/thread/create', function(req, res, next) {
                             create(req, function(err, thread) {
                                 if (err) {
                                     console.error(err);
-                                    res.json(returnCode.BUSY);
+                                    res.json(_.assign(err, returnCode.BUSY));
                                 } else {
                                     forumAboutMEService.saveThread(thread);
                                     forumLimitOperationService.checkLimitOperationProhibitionAddIntegral(userId, function(err, flag) {