mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-10-26 16:46:12 +01:00
Merge branch 'master' into develop
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
"use strict";
|
||||
'use strict';
|
||||
|
||||
var async = require('async');
|
||||
|
||||
@@ -48,7 +48,7 @@ SocketPosts.reply = function (socket, data, callback) {
|
||||
user.updateOnlineUsers(socket.uid);
|
||||
|
||||
socketHelpers.notifyNew(socket.uid, 'newPost', result);
|
||||
}
|
||||
},
|
||||
], callback);
|
||||
};
|
||||
|
||||
@@ -68,7 +68,7 @@ SocketPosts.getRawPost = function (socket, pid, callback) {
|
||||
return next(new Error('[[error:no-post]]'));
|
||||
}
|
||||
next(null, postData.content);
|
||||
}
|
||||
},
|
||||
], callback);
|
||||
};
|
||||
|
||||
@@ -134,7 +134,7 @@ SocketPosts.getReplies = function (socket, pid, callback) {
|
||||
},
|
||||
privileges: function (next) {
|
||||
privileges.posts.get(pids, socket.uid, next);
|
||||
}
|
||||
},
|
||||
}, next);
|
||||
},
|
||||
function (results, next) {
|
||||
@@ -149,7 +149,7 @@ SocketPosts.getReplies = function (socket, pid, callback) {
|
||||
posts.modifyPostByPrivilege(postData, postPrivileges.isAdminOrMod);
|
||||
});
|
||||
next(null, postData);
|
||||
}
|
||||
},
|
||||
], callback);
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user