Merge branch 'master' into SANDBOX

95f41ba3 · strong · e87edd9f · ec7b4d1e · 95f41ba3
Commit 95f41ba3 authored Jan 18, 2016 by strong
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

forumThreadService.js app/service/forumThreadService.js +4 -2

No files found.
--- a/app/service/forumThreadService.js
+++ b/app/service/forumThreadService.js
@@ -28,8 +28,8 @@ var listThreadFields = {
    tag:1,
    tag_top:1,
    pv_count:1,
-    address:1
-
+    address:1,
+    info:1
 };

 var singleThreadFields = {
@@ -984,6 +984,8 @@ exports.updateTagTop = function(tid,tag_top,callback){
    var time = '';
    if(tag_top == 1){
        time = new Date();
+    }else{
+        time = null;
    }
    ForumThread.findOneAndUpdate({
        _id: tid