From 77ab66b1a1971c12098287725cdf01aaeeff280d Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 14 Apr 2010 23:52:31 +0200 Subject: Bugfix for inheritance and override --- etherpad/src/etherpad/utils.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etherpad/src/etherpad/utils.js b/etherpad/src/etherpad/utils.js index 091901d..65ebe1f 100644 --- a/etherpad/src/etherpad/utils.js +++ b/etherpad/src/etherpad/utils.js @@ -120,7 +120,8 @@ function renderTemplateAsString(filename, data, plugin) { data = data || {}; data.helpers = helpers; // global helpers data.plugins = plugins; // Access callHook and the like... - var template = new Template(data, plugin); + if (data.template == undefined) + new Template(data, plugin); var f = findTemplate(filename, plugin); //"/templates/"+filename; if (! appjet.scopeCache.ejs) { -- cgit v1.2.3