Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* (bug 9252) Fix for tidy funkiness when using editintro mode

Browse source
This commit is contained in:
Brion Vibber 2007-09-11 18:22:37 +00:00
parent b4cc2a3e3f
commit 8e73228dc6
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASE-NOTES
View file

@ -46,6 +46,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
* (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 ===

2
includes/GlobalFunctions.php
View file

@ -592,7 +592,7 @@ function wfMsgExt( $key, $options ) {
} 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) ) {

4
includes/OutputPage.php
View file

@ -351,10 +351,12 @@ class OutputPage {
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 );