Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-14 09:55:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

#2560

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2015-02-23 14:05:43 -05:00
parent 1d5e15eab4
commit e6e755dd46
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/middleware/admin.js
View File

@@ -40,13 +40,14 @@ middleware.buildHeader = function(req, res, next) {
'authentication': [] 'authentication': []
}; };
user.getUserFields(uid, ['username', 'userslug', 'picture', 'email:confirmed'], function(err, userData) { user.getUserFields(uid, ['username', 'userslug', 'email', 'picture', 'email:confirmed'], function(err, userData) {
if (err) { if (err) {
return next(err); return next(err);
} }
userData.uid = uid; userData.uid = uid;
userData['email:confirmed'] = parseInt(userData['email:confirmed'], 10) === 1;
async.parallel({ async.parallel({
scripts: function(next) { scripts: function(next) {
plugins.fireHook('filter:admin.scripts.get', [], function(err, scripts) { plugins.fireHook('filter:admin.scripts.get', [], function(err, scripts) {
@@ -72,16 +73,15 @@ middleware.buildHeader = function(req, res, next) {
return next(err); return next(err);
} }
res.locals.config = results.config; res.locals.config = results.config;
var data = { var data = {
relative_path: nconf.get('relative_path'), relative_path: nconf.get('relative_path'),
configJSON: JSON.stringify(results.config), configJSON: JSON.stringify(results.config),
user: userData,
userJSON: JSON.stringify(userData), userJSON: JSON.stringify(userData),
plugins: results.custom_header.plugins, plugins: results.custom_header.plugins,
authentication: results.custom_header.authentication, authentication: results.custom_header.authentication,
scripts: results.scripts, scripts: results.scripts,
userpicture: userData.picture,
username: userData.username,
userslug: userData.userslug,
'cache-buster': meta.config['cache-buster'] ? 'v=' + meta.config['cache-buster'] : '', 'cache-buster': meta.config['cache-buster'] ? 'v=' + meta.config['cache-buster'] : '',
env: process.env.NODE_ENV ? true : false env: process.env.NODE_ENV ? true : false
}; };