From: Erik Moeller <erik@users.mediawiki.org>
Date: Fri, 9 Apr 2004 07:55:37 +0000 (+0000)
Subject: quickfix for bug that caused
X-Git-Tag: 1.3.0beta1~536
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=d6c69e3b9474ce392ea34e2a6074b3b4a1d4acec;p=lhc%2Fweb%2Fwiklou.git

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 d6dde5b785..83f93d81c8 100644
--- 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();