[wiki] on arrete de balancer du HTML

Ces macros sont appel'ees par getpagelinks. Si elles balancent n'importe
quoi lorsqu'on cherche a obtenir leurs liens, CategoriePagePublique
n'apparait pas...

darcs-hash:20090427142002-bd074-46977e63783af21b013023b46ee7e289020f28a7.gz

wiki-lenny/local/macro/Gravatar.py

@@ -9,7 +9,6 @@
 
 def execute(macro, text):
     import md5
-    
     parseargs = text.split(',')
     if len(parseargs)<2:
         return '<small><strong class="error">MailTo macro must have at least two arguments</strong></small>'
@@ -19,4 +18,4 @@ def execute(macro, text):
     user_id = md5.md5( email.strip() ).hexdigest()
     url = 'http://www.gravatar.com/avatar.php?gravatar_id=%s&size=80' % user_id
     html = "<img src=\"%s\" alt=\"Gravatar\" />" % url
-    return html
+    return macro.formatter.rawHTML(html)

wiki-lenny/local/macro/PagesPerso.py

@@ -101,4 +101,4 @@ def execute(macro, args):
     index = makeIndex(letter_list)
     html = index + html
     html += u'<br style="clear: both">'
-    return html
+    return macro.formatter.rawHTML(html)

wiki-lenny/local/macro/ProgressBar.py

@@ -110,11 +110,11 @@ def execute (macro, text, args_re=None):
 
     try:     res = _execute (macro, text)
     except Exception, msg:
-        return """
+        return macro.formatter.rawHTML("""
         <p><strong class="error">
         Error: macro ProgressBar: %s</strong> </p>
-        """ % escape ("%s" % msg)
-    return res
+        """ % escape ("%s" % msg))
+    return macro.formatter.rawHTML(res)
 
 
 def _execute (macro, text):

wiki-lenny/local/macro/SubscribeTo.py

@@ -27,6 +27,11 @@ import re
 
 def execute (macro, args):
 	_ = macro.request.getText
+
+	# return immediately if getting links for the current page
+	if request.mode_getpagelinks:
+		return ''
+
 	unknownuname = {}
 	missingemail = {}
 	outofdateversion = 0

wiki-lenny/local/macro/TV.py

@@ -89,5 +89,3 @@ def execute(macro, args):
         i += 1
     text+= macro.formatter.table(0)
     return text
-    
-   

wiki-lenny/local/macro/YouTube.py

@@ -24,4 +24,4 @@ def execute(macro, text):
     <embed src="%(youtubelink)s" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350"></embed>
     </object>
     ''' % {"youtubelink": url}
-    return html
+    return macro.formatter.rawHTML(html)