Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-01 00:08:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.5.1' into topic_searching

Browse Source
This commit is contained in:
Julian Lam
2014-08-27 15:04:43 -04:00
parent 1d3aafc08f 347fc05376
commit df5283cbae
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/socket.io/posts.js
View File

@@ -367,4 +367,8 @@ SocketPosts.getCategory = function(socket, pid, callback) {
posts.getCidByPid(pid, callback);
};
SocketPosts.getPidIndex = function(socket, pid, callback) {
posts.getPidIndex(pid, socket.uid, callback);
};
module.exports = SocketPosts;

2
src/user/notifications.js
View File

@@ -254,7 +254,7 @@ var async = require('async'),
}
notifications = notifications.filter(function(notification) {
return !!notification || notification[field] !== value.toString();
return notification && notification[field] !== value.toString();
}).map(function(notification) {
return notification.nid;
});