Index: trunk/phase3/includes/GlobalFunctions.php
===================================================================
--- trunk/phase3/includes/GlobalFunctions.php (revision 25792)
+++ trunk/phase3/includes/GlobalFunctions.php (revision 25793)
@@ -592,7 +592,7 @@
} elseif ( in_array('parseinline', $options) ) {
$string = $wgOut->parse( $string, true, true );
$m = array();
- if( preg_match( '/^<p>(.*)\n?<\/p>$/sU', $string, $m ) ) {
+ if( preg_match( '/^<p>(.*)\n?<\/p>\n?$/sU', $string, $m ) ) {
$string = $m[1];
}
} elseif ( in_array('parsemag', $options) ) {
Index: trunk/phase3/includes/OutputPage.php
===================================================================
--- trunk/phase3/includes/OutputPage.php (revision 25792)
+++ trunk/phase3/includes/OutputPage.php (revision 25793)
@@ -351,10 +351,12 @@
wfIncrStats('pcache_not_possible');
$popts = $this->parserOptions();
- $popts->setTidy($tidy);
+ $oldTidy = $popts->setTidy($tidy);
$parserOutput = $wgParser->parse( $text, $title, $popts,
$linestart, true, $this->mRevisionId );
+
+ $popts->setTidy( $oldTidy );
$this->addParserOutput( $parserOutput );
Index: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES (revision 25792)
+++ trunk/phase3/RELEASE-NOTES (revision 25793)
@@ -46,7 +46,9 @@
* (bug 11158) Fix escaping in API HTML-formatted JSON
* Fixed notice when accessing special page without read permission and whitelist
is not defined
+* (bug 9252) Fix for tidy funkiness when using editintro mode
+
=== API changes in 1.12 ===
Full API documentation is available at http://www.mediawiki.org/wiki/API
