quickfix for bug that caused

- paragraphs to be stripped from intro sections
- <br> instead of paragraphs after the intro section
will break xhtml

diff --git a/includes/Parser.php b/includes/Parser.php
index d6dde5b..83f93d8 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -430,6 +430,7 @@ class Parser
                }
 
                $text = $this->replaceExternalLinks( $text );
+               $text = $this->doBlockLevels( $text, $linestart );
                $text = $this->doTokenizedParser ( $text );
                $text = $this->doTableStuff ( $text ) ;
 
@@ -444,7 +445,7 @@ class Parser
                        "/<\\/center *>/i" => '</span>'
                );
                $text = preg_replace( array_keys($fixtags), array_values($fixtags), $text );
-               $text = $this->doBlockLevels( $text, $linestart );
+
                $text .= $this->categoryMagic () ;
 
                wfProfileOut( $fname );
@@ -1052,7 +1053,7 @@ class Parser
                                                        $text .= "<" . $newSection . ">";
                                                        $this->mLastSection = $newSection;
                                                } else if ( $this->mLastSection == 'p' and '' == $oLine) {
-                                                       $text .= '<br />';
+                                                       $text .= '<p>';
                                                }
                                        } else if ( $this->mLastSection == $newSection and $newSection != 'p' ) {
                                                $text .= $this->closeParagraph();