| Index: trunk/phase3/includes/Parser.php |
| — | — | @@ -1896,10 +1896,10 @@ |
| 1897 | 1897 | wfProfileIn( "$fname-paragraph" ); |
| 1898 | 1898 | # No prefix (not in list)--go to paragraph mode |
| 1899 | 1899 | // XXX: use a stack for nestable elements like span, table and div |
| 1900 | | - $openmatch = preg_match('/(<table|<blockquote|<h1|<h2|<h3|<h4|<h5|<h6|<pre|<tr|<p|<ul|<li|<\\/tr|<\\/td|<\\/th)/iS', $t ); |
| | 1900 | + $openmatch = preg_match('/(<table|<blockquote|<h1|<h2|<h3|<h4|<h5|<h6|<pre|<tr|<p|<ul|<ol|<li|<\\/tr|<\\/td|<\\/th)/iS', $t ); |
| 1901 | 1901 | $closematch = preg_match( |
| 1902 | 1902 | '/(<\\/table|<\\/blockquote|<\\/h1|<\\/h2|<\\/h3|<\\/h4|<\\/h5|<\\/h6|'. |
| 1903 | | - '<td|<th|<div|<\\/div|<hr|<\\/pre|<\\/p|'.$this->mUniqPrefix.'-pre|<\\/li|<\\/ul)/iS', $t ); |
| | 1903 | + '<td|<th|<div|<\\/div|<hr|<\\/pre|<\\/p|'.$this->mUniqPrefix.'-pre|<\\/li|<\\/ul|<\\/ol)/iS', $t ); |
| 1904 | 1904 | if ( $openmatch or $closematch ) { |
| 1905 | 1905 | $paragraphStack = false; |
| 1906 | 1906 | # TODO bug 5718: paragraph closed |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -422,7 +422,10 @@ |
| 423 | 423 | * (bug 6114) Update to Walloon localization (wa) |
| 424 | 424 | * Added $wgNamespaceRobotPolicies to allow customisation of robot policies on a |
| 425 | 425 | per-namespace basis. |
| | 426 | +* Add <ol> to the list of block elements for doBlockLevels; avoids <p>s being |
| | 427 | + interspersed into your ordered lists. |
| 426 | 428 | |
| | 429 | + |
| 427 | 430 | == Compatibility == |
| 428 | 431 | |
| 429 | 432 | MediaWiki 1.7 requires PHP 5 (5.1 recommended). PHP 4 is no longer supported. |