Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 11:05:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Julian Lam
2018-04-24 11:55:17 -04:00
parent 1f1e055509 5461f9fa5f
commit 7089e5c6a6
37 changed files with 192 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/controllers/authentication.js
View File

@@ -387,8 +387,8 @@ authenticationController.localLogin = function (req, username, password, next) {
userData: function (next) {
db.getObjectFields('user:' + uid, ['password', 'passwordExpiry'], next);
},
isAdmin: function (next) {
user.isAdministrator(uid, next);
isAdminOrGlobalMod: function (next) {
user.isAdminOrGlobalMod(uid, next);
},
banned: function (next) {
user.isBanned(uid, next);
@@ -398,9 +398,9 @@ authenticationController.localLogin = function (req, username, password, next) {
function (result, next) {
userData = result.userData;
userData.uid = uid;
userData.isAdmin = result.isAdmin;
userData.isAdminOrGlobalMod = result.isAdminOrGlobalMod;
if (!result.isAdmin && parseInt(meta.config.allowLocalLogin, 10) === 0) {
if (!result.isAdminOrGlobalMod && parseInt(meta.config.allowLocalLogin, 10) === 0) {
return next(new Error('[[error:local-login-disabled]]'));
}