From 622823a5952bb42f6a70d1db8eae277ff178470e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 4 Jun 2006 02:06:24 +0000
Subject: [PATCH] * Add <ol> to the list of block elements for doBlockLevels;
 avoids <p>s being interspersed into your ordered lists. Since this doesn't
 have larger consequences, I'm checking this in before the bigger Sanitizer
 parts of the bug 5497 fix.

---
 RELEASE-NOTES       | 3 +++
 includes/Parser.php | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7d709a731b..066fb107a4 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -422,6 +422,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 6114) Update to Walloon localization (wa)
 * Added $wgNamespaceRobotPolicies to allow customisation of robot policies on a 
   per-namespace basis.
+* Add <ol> to the list of block elements for doBlockLevels; avoids <p>s being
+  interspersed into your ordered lists.
+
 
 == Compatibility ==
 
diff --git a/includes/Parser.php b/includes/Parser.php
index e580cc4d3e..e4b9d23325 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1896,10 +1896,10 @@ class Parser
 				wfProfileIn( "$fname-paragraph" );
 				# No prefix (not in list)--go to paragraph mode
 				// XXX: use a stack for nestable elements like span, table and div
-				$openmatch = preg_match('/(<table|<blockquote|<h1|<h2|<h3|<h4|<h5|<h6|<pre|<tr|<p|<ul|<li|<\\/tr|<\\/td|<\\/th)/iS', $t );
+				$openmatch = preg_match('/(<table|<blockquote|<h1|<h2|<h3|<h4|<h5|<h6|<pre|<tr|<p|<ul|<ol|<li|<\\/tr|<\\/td|<\\/th)/iS', $t );
 				$closematch = preg_match(
 					'/(<\\/table|<\\/blockquote|<\\/h1|<\\/h2|<\\/h3|<\\/h4|<\\/h5|<\\/h6|'.
-					'<td|<th|<div|<\\/div|<hr|<\\/pre|<\\/p|'.$this->mUniqPrefix.'-pre|<\\/li|<\\/ul)/iS', $t );
+					'<td|<th|<div|<\\/div|<hr|<\\/pre|<\\/p|'.$this->mUniqPrefix.'-pre|<\\/li|<\\/ul|<\\/ol)/iS', $t );
 				if ( $openmatch or $closematch ) {
 					$paragraphStack = false;
 					# TODO bug 5718: paragraph closed
-- 
2.20.1