Merge remote-tracking branch 'origin/master' into socket.io1.x

This commit is contained in:
barisusakli
2014-11-20 19:15:39 -05:00

View File

@@ -200,7 +200,7 @@ SocketUser.uploadProfileImageFromUrl = function(socket, url, callback) {
return callback(err); return callback(err);
} }
user.setUserFields(socket.uid, {uploadedpicture: data.image.url, picture: data.image.url}, function(err) { user.setUserFields(socket.uid, {uploadedpicture: data.url, picture: data.url}, function(err) {
callback(err, data.image.url); callback(err, data.image.url);
}); });
}); });