Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-22 08:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/psychobunny/NodeBB

Browse Source
This commit is contained in:
psychobunny
2013-05-07 16:52:41 +00:00
parent 31542cd9be ec104b05d4
commit ace64cec7b
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/webserver.js
View File

@@ -331,13 +331,21 @@ passport.deserializeUser(function(uid, done) {
if (req.user === undefined)
return res.redirect('/403');
var requestedUserId = req.user.uid;
user.getUserData(req.user.uid, function(data) {
if(req.params.id != req.user.uid)
requestedUserId = req.params.id;
data.joindate = utils.relativeTime(data.joindate);
var userData = {user:data};
callback(userData);
user.getUserData(requestedUserId, function(data) {
if(data)
{
data.joindate = utils.relativeTime(data.joindate);
callback({user:data});
}
else
callback({user:{}});
});
}