Index: trac/wiki/formatter.py =================================================================== --- trac/wiki/formatter.py (revision 2537) +++ trac/wiki/formatter.py (working copy) @@ -28,6 +28,7 @@ from trac import util from trac.mimeview import * from trac.wiki.api import WikiSystem +from trac.perm import PermissionError __all__ = ['wiki_to_html', 'wiki_to_oneliner', 'wiki_to_outline'] @@ -373,6 +374,10 @@ try: macro = WikiProcessor(self.env, name) return macro.process(self.req, args, 1) + # re-raise PermissionError to allow permission handling in wiki + # macros cprov 20051213 + except PermissionError, e: + raise e except Exception, e: self.env.log.error('Macro %s(%s) failed' % (name, args), exc_info=True)