Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-08 00:22:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:designcreateplay/NodeBB

Browse Source
This commit is contained in:
Julian Lam
2013-09-30 16:28:50 -04:00
parent 865edb70c2 e78369f0fa
commit b19d84f1a7
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/user.js
View File

@@ -319,10 +319,13 @@ var utils = require('./../public/src/utils.js'),
function iterator(uid, callback) {
User.getUserData(uid, function(err, userData) {
if (userData) {
data.push(userData);
}
callback(null);
User.isAdministrator(uid, function(isAdmin) {
if (userData) {
userData.administrator = isAdmin?"1":"0";
data.push(userData);
}
callback(null);
});
});
}
@@ -330,6 +333,7 @@ var utils = require('./../public/src/utils.js'),
callback(err, data);
});
});
}
User.createGravatarURLFromEmail = function(email) {