changeset 547:44fa9948b41a

avoid <p> directly after <table> tag imported from: moin--main--1.5--patch-551
author Thomas Waldmann <tw@waldmann-edv.de>
date Mon, 10 Apr 2006 11:46:51 +0000
parents a3952e509faa
children dec24a04ef10
files ChangeLog MoinMoin/parser/wiki.py
diffstat 2 files changed, 15 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Apr 10 11:27:21 2006 +0000
+++ b/ChangeLog	Mon Apr 10 11:46:51 2006 +0000
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--arch@arch.thinkmo.de--2003-archives/moin--main--1.5
 #
 
+2006-04-10 12:46:51 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-551
+
+    Summary:
+      avoid <p> directly after <table> tag
+    Revision:
+      moin--main--1.5--patch-551
+
+    avoid <p> directly after <table> tag
+    
+
+    modified files:
+     ChangeLog MoinMoin/parser/wiki.py
+
+
 2006-04-10 12:27:21 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-550
 
     Summary:
--- a/MoinMoin/parser/wiki.py	Mon Apr 10 11:27:21 2006 +0000
+++ b/MoinMoin/parser/wiki.py	Mon Apr 10 11:46:51 2006 +0000
@@ -863,7 +863,7 @@
                 result.append(self.formatter.text(line[lastpos:match.start()]))
             
             # Replace match with markup
-            if not (self.inhibit_p or self.in_pre or self.formatter.in_p):
+            if not (self.inhibit_p or self.in_pre or self.formatter.in_p or self.in_table):
                 result.append(self.formatter.paragraph(1, css_class="line867"))
             result.append(self.replace(match))
             lastpos = match.end()