Просмотр исходного кода

fixing incorrectly written variable

Charley Peng 12 лет назад
Родитель
Сommit
fa80b0c3d2
1 измененных файлов с 4 добавлено и 4 удалено
  1. 4 4
      services/web/app/coffee/controllers/UserController.coffee

+ 4 - 4
services/web/app/coffee/controllers/UserController.coffee

@@ -170,7 +170,7 @@ module.exports =
 		metrics.inc "user.password-change"
 		metrics.inc "user.password-change"
 		oldPass = req.body.currentPassword
 		oldPass = req.body.currentPassword
 		AuthenticationManager.authenticate _id: req.session.user._id, oldPass, (err, user)->
 		AuthenticationManager.authenticate _id: req.session.user._id, oldPass, (err, user)->
-			return callback(error) if error?
+			return callback(err) if err?
 			if(user)
 			if(user)
 				logger.log user: req.session.user, "changing password"
 				logger.log user: req.session.user, "changing password"
 				newPassword1 = req.body.newPassword1
 				newPassword1 = req.body.newPassword1
@@ -199,20 +199,20 @@ module.exports =
 	redirectUserToDropboxAuth: (req, res)->
 	redirectUserToDropboxAuth: (req, res)->
 		user_id = req.session.user._id
 		user_id = req.session.user._id
 		dropboxHandler.getDropboxRegisterUrl user_id, (err, url)->
 		dropboxHandler.getDropboxRegisterUrl user_id, (err, url)->
-			return callback(error) if error?
+			return callback(err) if err?
 			logger.log url:url, "redirecting user for dropbox auth"
 			logger.log url:url, "redirecting user for dropbox auth"
 			res.redirect url
 			res.redirect url
 
 
 	completeDropboxRegistration: (req, res)->
 	completeDropboxRegistration: (req, res)->
 		user_id = req.session.user._id
 		user_id = req.session.user._id
 		dropboxHandler.completeRegistration user_id, (err, success)->
 		dropboxHandler.completeRegistration user_id, (err, success)->
-			return callback(error) if error?
+			return callback(err) if err?
 			res.redirect('/user/settings#dropboxSettings')
 			res.redirect('/user/settings#dropboxSettings')
 
 
 	unlinkDropbox: (req, res)->
 	unlinkDropbox: (req, res)->
 		user_id = req.session.user._id
 		user_id = req.session.user._id
 		dropboxHandler.unlinkAccount user_id, (err, success)->
 		dropboxHandler.unlinkAccount user_id, (err, success)->
-			return callback(error) if error?
+			return callback(err) if err?
 			res.redirect('/user/settings#dropboxSettings')
 			res.redirect('/user/settings#dropboxSettings')
 
 
 	deleteUser: (req, res)->
 	deleteUser: (req, res)->