From 4f655ca3bab21a88fc758f7079a45e45fb529f54 Mon Sep 17 00:00:00 2001
From: Ryan Schmidt
", $this->mStripState );
+ $replacer = new DoubleReplacer( ' ', ' ' );
+ $text = $this->recursiveTagParse( $in );
+ $text = $this->mStripState->unstripNoWiki( $text );
// Only strip the very first and very last \n (which trim cannot do)
- $text = $in;
- if( substr( $in, 0, 1 ) == "\n" )
- $text = substr( $in, 1 );
+ if( substr( $text, 0, 1 ) == "\n" )
+ $text = substr( $text, 1 );
if( substr( $text, -1 ) == "\n" )
$text = substr( $text, 0, -1 );
- $text = str_replace( "\n", "$tag\n", $text );
+ $text = str_replace( "\n", "
\n", $text );
$text = preg_replace_callback(
"/^( +)/m",
- create_function(
- '$matches',
- 'return str_replace(" ", " ", "$matches[0]");'
- ),
+ $replacer->cb(),
$text );
- $text = $this->recursiveTagParse( $text );
// Pass HTML attributes through to the output.
$attribs = Sanitizer::validateTagAttributes( $param, 'div' );
@@ -4218,7 +4215,7 @@ class Parser
$attribs['class'] = 'poem';
}
- return XML::openElement( 'div', $attribs ) . $nl . trim( $text ) . $nl . XML::closeElement( 'div' );
+ return Xml::openElement( 'div', $attribs ) . $nl . trim( $text ) . $nl . Xml::closeElement( 'div' );
}
function getImageParams( $handler ) {
diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index 20876f2e8f..5f5f54fc85 100644
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -7234,9 +7234,7 @@ test
this
is
a
-test
-
-