Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-28 01:26:16 +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-01-29 18:11:30 -05:00
parent 7581dd1174 fad0c5f2d5
commit 897a7d84f9
16 changed files with 124 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/accounts/helpers.js
View File

@@ -113,7 +113,7 @@ helpers.getUserDataByUserSlug = function (userslug, callerUID, callback) {
userData.fullname = '';
}
if (isAdmin || isSelf || (isGlobalModerator && !results.isTargetAdmin)) {
if (isAdmin || isSelf || ((isGlobalModerator || isModerator) && !results.isTargetAdmin)) {
userData.ips = results.ips;
}