From 56566106c29e2da155d93fb2599230617cfb6d81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Alby?= Date: Mon, 4 Nov 2019 16:49:58 +0700 Subject: [PATCH] Merge pull request #2311 from overleaf/fix-err-error-checks Fix two err/error confusion issues GitOrigin-RevId: 3dfdeffa5a8d13d64dca3f70533a87c70a06d49b --- services/web/app/src/Features/Chat/ChatController.js | 8 +++----- .../web/app/src/Features/History/HistoryController.js | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/services/web/app/src/Features/Chat/ChatController.js b/services/web/app/src/Features/Chat/ChatController.js index b8cc00924b..5738dcd839 100644 --- a/services/web/app/src/Features/Chat/ChatController.js +++ b/services/web/app/src/Features/Chat/ChatController.js @@ -113,13 +113,11 @@ module.exports = ChatController = { const _ = user_ids[user_id] ;(user_id => jobs.push(cb => - UserInfoManager.getPersonalInfo(user_id, function(err, user) { - if (typeof error !== 'undefined' && error !== null) { - return cb(error) - } + UserInfoManager.getPersonalInfo(user_id, function(error, user) { + if (error != null) return cb(error) user = UserInfoController.formatPersonalInfo(user) users[user_id] = user - return cb() + cb() }) ))(user_id) } diff --git a/services/web/app/src/Features/History/HistoryController.js b/services/web/app/src/Features/History/HistoryController.js index 161fb17a9e..59c031d838 100644 --- a/services/web/app/src/Features/History/HistoryController.js +++ b/services/web/app/src/Features/History/HistoryController.js @@ -184,11 +184,9 @@ module.exports = HistoryController = { project_id, doc_id, name, - (err, doc) => { - if (typeof error !== 'undefined' && error !== null) { - return next(error) - } - return res.json({ + (error, doc) => { + if (error != null) return next(error) + res.json({ doc_id: doc._id }) }