From eab0ca746306cba07e7a5afb7f661d868b062429 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 28 Mar 2014 17:05:09 -0400 Subject: [PATCH] allow custom themes to include templates that don't exist in the base theme --- src/middleware/index.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/middleware/index.js b/src/middleware/index.js index a3eaf67f35..9294d2cab2 100644 --- a/src/middleware/index.js +++ b/src/middleware/index.js @@ -95,10 +95,11 @@ function compileTemplates(pluginTemplates) { themeTpls = !themeTpls ? [] : themeTpls.map(function(tpl) { return tpl.replace(nconf.get('theme_templates_path'), ''); }); baseTpls.forEach(function(el, i) { - var relative_path = (themeTpls.indexOf(el) !== -1 ? themeTpls[themeTpls.indexOf(el)] : baseTpls[i]), - full_path = path.join(themeTpls.indexOf(el) !== -1 ? nconf.get('theme_templates_path') : nconf.get('base_templates_path'), relative_path); + paths[baseTpls[i]] = path.join(nconf.get('base_templates_path'), baseTpls[i]); + }); - paths[themeTpls.indexOf(el) !== -1 ? themeTpls[themeTpls.indexOf(el)] : baseTpls[i]] = full_path; + themeTpls.forEach(function(el, i) { + paths[themeTpls[i]] = path.join(nconf.get('theme_templates_path'), themeTpls[i]); }); async.each(Object.keys(paths), function(relative_path, next) {