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

2014-05-14 20:01:52 +02:00
parent a38f2354f5 50f28d4478
commit 56c54cfa6a
1 changed files with 1 additions and 1 deletions
@@ -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{