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

Merge branch 'master' into 0.7.0

Browse Source 
Conflicts:
	public/src/client/groups/list.js
This commit is contained in:
Julian Lam
2015-01-21 17:16:06 -05:00
parent 78a5843ae4 af1fa11606
commit be30dcc2d0
4 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/groups.js
View File

@@ -878,8 +878,8 @@ var async = require('async'),
};
Groups.search = function(query, options, callback) {
if (!query || !query.length) {
return callback(null, []);
if (!query) {
query = '';
}
async.waterfall([

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

@@ -127,11 +127,11 @@ SocketGroups.delete = function(socket, data, callback) {
};
SocketGroups.search = function(socket, data, callback) {
if (!data || !data.query) {
if (!data) {
return callback(null, []);
}
groups.search(data.query, data.options || {}, callback);
groups.search(data.query || '', data.options || {}, callback);
};
SocketGroups.cover = {};