Merge branch 'develop' into blade-Finish_weeklies_pr

Added Sabe's novalidate change to adding a new task
2015-06-10 07:53:37 -05:00
parent c8ed73f685 40f9ff93de
commit 1d18f53a67
195 changed files with 2487 additions and 1401 deletions
@@ -127,7 +127,7 @@ var getUserLanguage = function(req, res, next){
  }else if(req.locals && req.locals.user){
    getFromUser(req.locals.user);
  }else if(req.session && req.session.userId){
-    User.findOne({_id: req.session.userId}, function(err, user){
+    User.findOne({_id: req.session.userId}, 'preferences.language', function(err, user){
      if(err) return next(err);
      getFromUser(user);
    });