Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-28 09:36:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into webserver.js-refactor

Browse Source 
Conflicts:
	public/templates/admin/themes.tpl
	src/meta.js
	src/routes/api.js
This commit is contained in:
psychobunny
2014-03-09 19:19:13 -04:00
parent 37840d35f0 73c89010cb
commit 464c2f42c3
5 changed files with 77 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/controllers/api.js
View File

@@ -30,6 +30,7 @@ apiController.getConfig = function(req, res, next) {
config.topicsPerPage = meta.config.topicsPerPage || 20;
config.postsPerPage = meta.config.postsPerPage || 20;
config.maximumFileSize = meta.config.maximumFileSize;
config['theme:id'] = meta.config['theme:id'];
config.defaultLang = meta.config.defaultLang || 'en_GB';
config.environment = process.env.NODE_ENV;