summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2011-09-25 14:11:03 -0700
committerMarcel Hellkamp <marc@gsites.de>2011-09-25 14:11:03 -0700
commit37b61c1d3831b4425f00cdbbe5cd93fae5d2c353 (patch)
tree0b6e517ca03d94c1994f845556c43a1a22ca6003
parentcfc7e967e4cd2e0b146bfbeff1fbd5d1c5b9a2a4 (diff)
parent715603156bcca51da7099614dab91584790cb820 (diff)
downloadbottle-37b61c1d3831b4425f00cdbbe5cd93fae5d2c353.tar.gz
Merge pull request #229 from paulchakravarti/715603156bcca51da7099614dab91584790cb820
SimpleTemplate: %rebase does not cache base_template
-rwxr-xr-xbottle.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/bottle.py b/bottle.py
index 4504bcb..b68b781 100755
--- a/bottle.py
+++ b/bottle.py
@@ -2658,10 +2658,9 @@ class SimpleTemplate(BaseTemplate):
eval(self.co, env)
if '_rebase' in env:
subtpl, rargs = env['_rebase']
- subtpl = self.__class__(name=subtpl, lookup=self.lookup)
rargs['_base'] = _stdout[:] #copy stdout
del _stdout[:] # clear stdout
- return subtpl.execute(_stdout, rargs)
+ return self.subtemplate(subtpl,_stdout,rargs)
return env
def render(self, *args, **kwargs):