Merge pull request bottlepy#229 from paulchakravarti/715603156bcca51d…

…a7099614dab91584790cb820 SimpleTemplate: %rebase does not cache base_template
sbassi · Sep 25, 2011 · 37b61c1 · 37b61c1
2 parents cfc7e96 + 7156031
commit 37b61c1
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/bottle.py b/bottle.py
@@ -2658,10 +2658,9 @@ def execute(self, _stdout, *args, **kwargs):
         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):