Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop

This commit is contained in:
Matteo Pagliazzi 2014-05-14 20:01:52 +02:00
commit 56c54cfa6a

View file

@ -78,7 +78,7 @@ var getUserLanguage = function(req, res, next){
getFromUser(req.locals.user);
}else if(req.session && req.session.userId){
User.findOne({_id: req.session.userId}, function(err, user){
if(err) return callback(err);
if(err) return next(err);
getFromUser(user);
});
}else{