Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-08-26 23:47:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Baris Usakli
2017-10-30 15:29:26 -04:00
parent 41fbf7117d a500e0019c
commit 47143a4a09
19 changed files with 198 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/middleware/admin.js
View File

@@ -5,6 +5,7 @@ var winston = require('winston');
var user = require('../user');
var meta = require('../meta');
var plugins = require('../plugins');
var jsesc = require('jsesc');
var controllers = {
api: require('../controllers/api'),
@@ -73,11 +74,11 @@ module.exports = function (middleware) {
var templateValues = {
config: results.config,
configJSON: JSON.stringify(results.config),
configJSON: jsesc(JSON.stringify(results.config), { isScriptContext: true }),
relative_path: results.config.relative_path,
adminConfigJSON: encodeURIComponent(JSON.stringify(results.configs)),
user: userData,
userJSON: JSON.stringify(userData).replace(/'/g, "\\'"),
userJSON: jsesc(JSON.stringify(userData), { isScriptContext: true }),
plugins: results.custom_header.plugins,
authentication: results.custom_header.authentication,
scripts: results.scripts,