Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-29 10:06:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.7.0'

Browse Source 
Conflicts:
	package.json
	src/search.js
This commit is contained in:
Julian Lam
2015-02-07 17:07:48 -05:00
parent 8bbd7d971b 59da48dee5
commit 957415463f
18 changed files with 55 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/socket.io/user.js
View File

@@ -67,7 +67,8 @@ SocketUser.search = function(socket, data, callback) {
page: data.page,
searchBy: data.searchBy,
sortBy: data.sortBy,
filterBy: data.filterBy
filterBy: data.filterBy,
uid: socket.uid
}, callback);
};
@@ -393,7 +394,7 @@ SocketUser.loadMore = function(socket, data, callback) {
var start = parseInt(data.after, 10),
end = start + 19;
user.getUsersFromSet(data.set, start, end, function(err, userData) {
user.getUsersFromSet(data.set, socket.uid, start, end, function(err, userData) {
if (err) {
return callback(err);
}