Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 19:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

send back empty object if no data for user

Browse Source
This commit is contained in:
Baris Usakli
2013-06-20 11:20:37 -04:00
parent b1e369f1fc
commit 41aeee9839
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/src/forum/topic.js
View File

@@ -246,11 +246,12 @@
}); });
socket.on('chatMessage', function(data){ socket.on('chatMessage', function(data) {
var username = data.username; var username = data.username;
var fromuid = data.fromuid; var fromuid = data.fromuid;
var message = data.message; var message = data.message;
require(['chat'], function(chat) { require(['chat'], function(chat) {
var chatModal = chat.createModalIfDoesntExist(username, fromuid); var chatModal = chat.createModalIfDoesntExist(username, fromuid);
chatModal.show(); chatModal.show();

14
src/user.js
View File

@@ -42,7 +42,7 @@ var utils = require('./../public/src/utils.js'),
} }
var uuids = uids.filter(function(value, index, self) { var uuids = uids.filter(function(value, index, self) {
return self.indexOf(value) === index; return self.indexOf(value) === index;
}); });
var data = {}, var data = {},
@@ -64,10 +64,14 @@ var utils = require('./../public/src/utils.js'),
RDB.hgetall('user:'+uid, function(err, data){ RDB.hgetall('user:'+uid, function(err, data){
if(err === null) if(err === null)
{ {
if(data && data['password']) if(data) {
delete data['password']; if(data['password'])
data.uid = uid; delete data['password'];
callback(data); data.uid = uid;
callback(data);
}
else
callback({});
} }
else else
console.log(err); console.log(err);