changeset 2783:aec29d51f04b

add the additional 'markup' param also to the special TOC formatter
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Wed, 29 Aug 2007 15:12:44 +0200
parents 4c7a5994fe34
children 02a8bde864ab
files MoinMoin/macro/TableOfContents.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/macro/TableOfContents.py	Tue Aug 28 14:40:29 2007 +0200
+++ b/MoinMoin/macro/TableOfContents.py	Wed Aug 29 15:12:44 2007 +0200
@@ -64,14 +64,14 @@
             self.collected_headings.append([depth, id, u''])
         return ''
 
-    def macro(self, macro_obj, name, args):
+    def macro(self, macro_obj, name, args, markup=None):
         try:
             # plugins that are defined in the macro class itself
             # can't generate headings this way, but that's fine
             gen_headings = wikiutil.importPlugin(self.request.cfg, 'macro',
                                                  name, 'generates_headings')
             if gen_headings:
-                return FormatterBase.macro(self, macro_obj, name, args)
+                return FormatterBase.macro(self, macro_obj, name, args, markup)
         except (wikiutil.PluginMissingError, wikiutil.PluginAttributeError):
             pass
         return ''