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

plugin templates now have higher priority than theme templates

Browse Source
This commit is contained in:
psychobunny
2014-05-31 17:06:27 -04:00
parent 85aa88e6ed
commit c97d6635fc
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/middleware/index.js
View File

@@ -73,7 +73,7 @@ function compileTemplates(pluginTemplates) {
utils.walk(baseTemplatesPath, function(err, baseTpls) { utils.walk(baseTemplatesPath, function(err, baseTpls) {
utils.walk(themeTemplatesPath, function (err, themeTpls) { utils.walk(themeTemplatesPath, function (err, themeTpls) {
var paths = pluginTemplates; var paths = {};
if (!baseTpls || !themeTpls) { if (!baseTpls || !themeTpls) {
winston.warn('[themes] Could not find base template files at: ' + baseTemplatesPath); winston.warn('[themes] Could not find base template files at: ' + baseTemplatesPath);
@@ -90,6 +90,12 @@ function compileTemplates(pluginTemplates) {
paths[themeTpls[i]] = path.join(themeTemplatesPath, themeTpls[i]); paths[themeTpls[i]] = path.join(themeTemplatesPath, themeTpls[i]);
}); });
for (var tpl in pluginTemplates) {
if (pluginTemplates.hasOwnProperty(tpl)) {
paths[tpl] = pluginTemplates[tpl];
}
}
async.each(Object.keys(paths), function(relativePath, next) { async.each(Object.keys(paths), function(relativePath, next) {
var file = fs.readFileSync(paths[relativePath]).toString(), var file = fs.readFileSync(paths[relativePath]).toString(),
matches = null, matches = null,