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

Merge remote-tracking branch 'origin/0.5.1' into hashtalk

Browse Source
This commit is contained in:
barisusakli
2014-09-15 14:36:27 -04:00
parent 7c3dc4877a 84d4035597
commit da86c46b4c
212 changed files with 833 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/middleware/index.js
View File

@@ -65,7 +65,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) {