changeset 279:54b01975e285

Fixed a few direct (non-formatter) returns in wiki.py. Broken for years ;-) imported from: moin--main--1.5--patch-283
author Alexander Schremmer <alex@alexanderweb.de.tla>
date Sun, 04 Dec 2005 10:28:22 +0000
parents ce748c8271dd
children 015c945277ec
files MoinMoin/parser/wiki.py
diffstat 1 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/parser/wiki.py	Sat Dec 03 21:23:33 2005 +0000
+++ b/MoinMoin/parser/wiki.py	Sun Dec 04 10:28:22 2005 +0000
@@ -238,18 +238,18 @@
     def _small_repl(self, word):
         """Handle small."""
         if word.strip() == '~-' and self.is_small:
-            return word
+            return self.formatter.text(word)
         if word.strip() == '-~' and not self.is_small:
-            return word
+            return self.formatter.text(word)
         self.is_small = not self.is_small
         return self.formatter.small(self.is_small)
 
     def _big_repl(self, word):
         """Handle big."""
         if word.strip() == '~+' and self.is_big:
-            return word
+            return self.formatter.text(word)
         if word.strip() == '+~' and not self.is_big:
-            return word
+            return self.formatter.text(word)
         self.is_big = not self.is_big
         return self.formatter.big(self.is_big)
 
@@ -390,7 +390,7 @@
         if wikiname:
             return self._word_repl(wikiname)
         else:
-            return word
+            return self.formatter.text(word)
 
 
     def _url_bracket_repl(self, word):
@@ -675,7 +675,7 @@
             else:
                 msg = None
             #print "key: %s\nattrs: %s" % (key, str(attrs))
-            return msg
+            return self.formatter.rawHTML(msg)
 
         # scan attributes
         attr, msg = wikiutil.parseAttributes(self.request, attrdef, '>', table_extension)
@@ -693,7 +693,7 @@
             result += self.formatter.table_cell(0) + self.formatter.table_row(0)
             return result
         else:
-            return word
+            return self.formatter.text(word)
 
     def _table_repl(self, word):
         """Handle table cell separator."""
@@ -724,7 +724,7 @@
             result.append(self.formatter.table_cell(1, attrs) + attrerr)         
             return ''.join(result) 
         else:
-            return word
+            return self.formatter.text(word)
 
 
     def _heading_repl(self, word):
@@ -800,7 +800,7 @@
             self.in_pre = 0
             self.inhibit_p = 0
             return self.formatter.preformatted(self.in_pre)
-        return word
+        return self.formatter.text(word)
 
 
     def _smiley_repl(self, word):