Merge a14afc9115 into 359a6a5762

2017-05-30 16:00:07 +00:00 · 2017-05-30 16:00:07 +00:00 · f12122dbe9
parent 359a6a5762 a14afc9115
commit f12122dbe9
1 changed files with 1 additions and 1 deletions
--- a/common/models/user.js
+++ b/common/models/user.js
@ -271,7 +271,7 @@ module.exports = function(User) {
        user.hasPassword(credentials.password, function(err, isMatch) {
          if (err) {
            debug('An error is reported from User.hasPassword: %j', err);
-            fn(defaultError);
+            fn(err);
          } else if (isMatch) {
            if (self.settings.emailVerificationRequired && !user.emailVerified) {
              // Fail to log in if email verification is not done yet