(no commit message)

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index d951a02..c1c18a8 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -4190,23 +4190,20 @@ class Parser
                */
                $nl = array_key_exists( 'compact', $param ) ? '' : "\n";
   
-               $tag = $this->insertStripItem( "<br />", $this->mStripState );
+               $replacer = new DoubleReplacer( ' ', '&nbsp;' );
+               $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", "<br />\n", $text );
                $text = preg_replace_callback(
                        "/^( +)/m",
-                       create_function(
-                               '$matches',
-                               'return str_replace(" ", "&nbsp;", "$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 20876f2..5f5f54f 100644 (file)
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -7234,9 +7234,7 @@ test
 this<br />
 is<br />
 a<br />
-test<br />
-
-</p>
+test</p>
 </div>
 
 !!end
@@ -7256,9 +7254,7 @@ test
 this<br />
 '''is'''<br />
 a<br />
-test<br />
-
-</p>
+test</p>
 </div>
 
 !! end