Merge commit '6404a060' into SANDBOX

app/service/forumThreadService.js

@@ -770,11 +770,6 @@ function getSubThreads(doc, sort, callback) {
         pid: doc._id,
         status: 1
     };
-    countAllByFid(conditions, function(err, count) {
-        if (err) {
-            console.error(err);
-            callback(err, null);
-        } else {
     var sortBy = '-top -quality -created';
     if (sort) {
         sortBy = sort;
@@ -797,7 +792,7 @@ function getSubThreads(doc, sort, callback) {
                 }
             });
             var obj = {};
-                    obj.total = count;
+            obj.total = list.length;
             obj.items = list;
 
             var newDoc = doc.toObject();
@@ -806,8 +801,6 @@ function getSubThreads(doc, sort, callback) {
             callback(null, newDoc);
         }
     });
-        }
-    });
 }
 
 function getAllThreadByFidHelp(conditions, pageNo, pageSize, sort, callback) {