Changeset 3612

Timestamp:

05/06/08 02:29:38 (8 months ago)

Author:

coderanger

Message:

Escape if needed.

Files:

• includemacro/0.10/includemacro/macros.py (modified) (3 diffs)

includemacro/0.10/includemacro/macros.py

@@ -1 +1 @@
-# TracIncludeMacro macros
+import urllib2
+from HTMLParser import HTMLParseError
+
-from trac.core import *
-from trac.wiki.macros import WikiMacroBase
@@ -6 +9 @@
-from trac.mimeview.api import Mimeview, get_mimetype
-from trac.perm import IPermissionRequestor
-
-
+
-
-__all__ = ['IncludeMacro']
@@ -84 +86 @@
-        if dest_format:
-            out = Mimeview(self.env).render(req, dest_format, out)
+        
+        # Escape if needed
+        if not self.config.getbool('wiki', 'render_unsafe_content', False):
+            try:
+                out = Markup(out).sanitize()
+            except HTMLParseError:
+                out = Markup(out).escape()
+        
-        return out
-