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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Julian Lam
2014-03-19 10:28:40 -04:00
parent 4239c376c8 567d867b1e
commit c709b7ed5b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/controllers/api.js
View File

@@ -8,8 +8,10 @@ var pkg = require('./../../package.json'),
var apiController = {}; var apiController = {};
apiController.getConfig = function(req, res, next) { apiController.getConfig = function(req, res, next) {
var config = require('./../../public/config.json'); var serverConfig = require('./../../config.json');
var config = {};
config.relative_path = serverConfig.relative_path;
config.version = pkg.version; config.version = pkg.version;
config.postDelay = meta.config.postDelay; config.postDelay = meta.config.postDelay;
config.minimumTitleLength = meta.config.minimumTitleLength; config.minimumTitleLength = meta.config.minimumTitleLength;