# HG changeset patch # User cmlenz # Date 1180519506 0 # Node ID 78293158592549636f80836f3d66af13e999cab6 # Parent 8a90e761d5ff5d13ccc992a347916ea19ae84925 Fix bug introduced in [575]: includes weren't being processed inside match templates. diff --git a/genshi/template/markup.py b/genshi/template/markup.py --- a/genshi/template/markup.py +++ b/genshi/template/markup.py @@ -70,7 +70,12 @@ encoding=None, lookup='lenient'): Template.__init__(self, source, basedir=basedir, filename=filename, loader=loader, encoding=encoding, lookup=lookup) + # Make sure the include filter comes after the match filter + if loader: + self.filters.remove(self._include) self.filters += [self._exec, self._match] + if loader: + self.filters.append(self._include) def _parse(self, source, encoding): streams = [[]] # stacked lists of events of the "compiled" template