Index: trunk/phase3/maintenance/parserTests.txt |
— | — | @@ -314,6 +314,20 @@ |
315 | 315 | !! end |
316 | 316 | |
317 | 317 | !! test |
| 318 | +Regression with preformatted in <center> |
| 319 | +!! input |
| 320 | +<center> |
| 321 | + Blah |
| 322 | +</center> |
| 323 | +!! result |
| 324 | +<center> |
| 325 | +<pre>Blah |
| 326 | +</pre> |
| 327 | +</center> |
| 328 | + |
| 329 | +!! end |
| 330 | + |
| 331 | +!! test |
318 | 332 | <pre> with attributes (bug 3202) |
319 | 333 | !! input |
320 | 334 | <pre style="background: blue; color:white">Bluescreen of WikiDeath</pre> |
Index: trunk/phase3/includes/Parser.php |
— | — | @@ -1891,10 +1891,10 @@ |
1892 | 1892 | wfProfileIn( "$fname-paragraph" ); |
1893 | 1893 | # No prefix (not in list)--go to paragraph mode |
1894 | 1894 | // XXX: use a stack for nestable elements like span, table and div |
1895 | | - $openmatch = preg_match('/(<table|<blockquote|<h1|<h2|<h3|<h4|<h5|<h6|<pre|<tr|<p|<ul|<ol|<li|<center|<\\/tr|<\\/td|<\\/th)/iS', $t ); |
| 1895 | + $openmatch = preg_match('/(<table|<blockquote|<h1|<h2|<h3|<h4|<h5|<h6|<pre|<tr|<p|<ul|<ol|<li|<\\/center|<\\/tr|<\\/td|<\\/th)/iS', $t ); |
1896 | 1896 | $closematch = preg_match( |
1897 | 1897 | '/(<\\/table|<\\/blockquote|<\\/h1|<\\/h2|<\\/h3|<\\/h4|<\\/h5|<\\/h6|'. |
1898 | | - '<td|<th|<div|<\\/div|<hr|<\\/pre|<\\/p|'.$this->mUniqPrefix.'-pre|<\\/li|<\\/ul|<\\/ol|<\\/center)/iS', $t ); |
| 1898 | + '<td|<th|<div|<\\/div|<hr|<\\/pre|<\\/p|'.$this->mUniqPrefix.'-pre|<\\/li|<\\/ul|<\\/ol|<center)/iS', $t ); |
1899 | 1899 | if ( $openmatch or $closematch ) { |
1900 | 1900 | $paragraphStack = false; |
1901 | 1901 | # TODO bug 5718: paragraph closed |
Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -469,6 +469,7 @@ |
470 | 470 | * (bug 6254) Update to Indonesian translation (id) #20 |
471 | 471 | * (bug 6255) Fix transclusions starting with "#" or "*" in HTML attributes |
472 | 472 | * Whitespace now normalized more or less properly in HTML attributes |
| 473 | +* Fix regression(?) in behavior of initial-whitespace-pre in <center> |
473 | 474 | |
474 | 475 | |
475 | 476 | == Compatibility == |