diff options
| author | Egil Moeller <egil.moller@freecode.no> | 2010-04-14 23:52:31 +0200 |
|---|---|---|
| committer | Egil Moeller <egil.moller@freecode.no> | 2010-04-14 23:52:31 +0200 |
| commit | 77ab66b1a1971c12098287725cdf01aaeeff280d (patch) | |
| tree | 6f6e823ab013832d9329a360554283ccd021be41 | |
| parent | 9b3bf90c33d4e742111b434045a4d75b68a0780f (diff) | |
| download | etherpad-77ab66b1a1971c12098287725cdf01aaeeff280d.tar.gz etherpad-77ab66b1a1971c12098287725cdf01aaeeff280d.tar.xz etherpad-77ab66b1a1971c12098287725cdf01aaeeff280d.zip | |
Bugfix for inheritance and override
| -rw-r--r-- | etherpad/src/etherpad/utils.js | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |