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

src/user.js

@@ -319,17 +319,21 @@ var utils = require('./../public/src/utils.js'),
 
 			function iterator(uid, callback) {
 				User.getUserData(uid, function(err, userData) {
+					User.isAdministrator(uid, function(isAdmin) {
 						if (userData) {
+							userData.administrator = isAdmin?"1":"0";
 							data.push(userData);
 						}
 						callback(null);
 					});
+				});
 			}
 
 			async.eachSeries(uids, iterator, function(err) {
 				callback(err, data);
 			});
 		});
+
 	}
 
 	User.createGravatarURLFromEmail = function(email) {