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

Merge branch '0.5.1' into csrf-excision

Browse Source
This commit is contained in:
Julian Lam
2014-09-17 14:39:51 -04:00
parent f231b500d7 e9b373438d
commit 4f6b3055ff
282 changed files with 2219 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/middleware/index.js
View File

@@ -63,7 +63,15 @@ function routeCurrentTheme(app, themeId, themesData) {
}
// Theme's templates path
nconf.set('theme_templates_path', themeObj.templates ? path.join(themesPath, themeObj.id, themeObj.templates) : nconf.get('base_templates_path'));
var themePath = nconf.get('base_templates_path'),
fallback = path.join(themesPath, themeObj.id, 'templates');
if (themeObj.templates) {
themePath = path.join(themesPath, themeObj.id, themeObj.templates);
} else if (fs.existsSync(fallback)) {
themePath = fallback;
}
nconf.set('theme_templates_path', themePath);
}
module.exports = function(app, data) {