X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fparser%2FBlockLevelPass.php;h=c3669032d310efc38570bda46b094b3dc24e6581;hb=8eb6cf585c5fb3d7dd5f014bac27518959512b98;hp=1173dd208660a35f2b3a3d408adae82dd68446bc;hpb=8c371e76b7c10a00acac185ef91ef2627e0d582d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/parser/BlockLevelPass.php b/includes/parser/BlockLevelPass.php
index 1173dd2086..c3669032d3 100644
--- a/includes/parser/BlockLevelPass.php
+++ b/includes/parser/BlockLevelPass.php
@@ -291,19 +291,34 @@ class BlockLevelPass {
 			if ( 0 == $prefixLength ) {
 				# No prefix (not in list)--go to paragraph mode
 				# @todo consider using a stack for nestable elements like span, table and div
+
+				// P-wrapping and indent-pre are suppressed inside, not outside
+				$blockElems = 'table|h1|h2|h3|h4|h5|h6|pre|p|ul|ol|dl|li';
+				// P-wrapping and indent-pre are suppressed outside, not inside
+				$antiBlockElems = 'td|th';
+
 				$openMatch = preg_match(
-					'/(?:<table|<h1|<h2|<h3|<h4|<h5|<h6|<pre|<tr|'
-						. '<p|<ul|<ol|<dl|<li|<\\/tr|<\\/td|<\\/th)\\b/iS',
+					'/<('
+						. "({$blockElems})|\\/({$antiBlockElems})|"
+						// Always suppresses
+						. '\\/?(tr)'
+						. ')\\b/iS',
 					$t
 				);
 				$closeMatch = preg_match(
-					'/(?:<\\/table|<\\/h1|<\\/h2|<\\/h3|<\\/h4|<\\/h5|<\\/h6|'
-						. '<td|<th|<\\/?blockquote|<\\/?div|<hr|<\\/pre|<\\/p|<\\/mw:|'
-						. Parser::MARKER_PREFIX
-						. '-pre|<\\/li|<\\/ul|<\\/ol|<\\/dl|<\\/?center)\\b/iS',
+					'/<('
+						. "\\/({$blockElems})|({$antiBlockElems})|"
+						// Never suppresses
+						. '\\/?(center|blockquote|div|hr|mw:)'
+						. ')\\b/iS',
 					$t
 				);
 
+				// Any match closes the paragraph, but only when `!$closeMatch`
+				// do we enter block mode.  The oddities with table rows and
+				// cells are to avoid paragraph wrapping in interstitial spaces
+				// leading to fostered content.
+
 				if ( $openMatch || $closeMatch ) {
 					$pendingPTag = false;
 					// Only close the paragraph if we're not inside a <pre> tag, or if