Log message?

From: skizzerz@svn.wikimedia.org skizzerz@svn.wikimedia.org Date: Oct 12, 2008 4:20 AM Subject: [MediaWiki-CVS] SVN: [41983] trunk/phase3 To: mediawiki-cvs@lists.wikimedia.org

Revision: 41983 Author: skizzerz Date: 2008-10-12 02:20:08 +0000 (Sun, 12 Oct 2008)

Log Message:

Modified Paths:

trunk/phase3/includes/parser/Parser.php trunk/phase3/maintenance/parserTests.txt

Modified: trunk/phase3/includes/parser/Parser.php

--- trunk/phase3/includes/parser/Parser.php 2008-10-12 00:18:58 UTC (rev 41982) +++ trunk/phase3/includes/parser/Parser.php 2008-10-12 02:20:08 UTC (rev 41983) @@ -4190,23 +4190,20 @@ */ $nl = array_key_exists( 'compact', $param ) ? '' : "\n";

•           $tag = $this->insertStripItem( "<br />", $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", "<br />\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 @@ $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 ) {

Modified: trunk/phase3/maintenance/parserTests.txt

--- trunk/phase3/maintenance/parserTests.txt 2008-10-12 00:18:58 UTC (rev 41982) +++ trunk/phase3/maintenance/parserTests.txt 2008-10-12 02:20:08 UTC (rev 41983) @@ -7234,9 +7234,7 @@ this<br /> is<br /> a<br /> -test<br />

-</p> +test</p>

</div>

!!end @@ -7256,9 +7254,7 @@ this<br /> '''is'''<br /> a<br /> -test<br />

-</p> +test</p>

</div>

!! end

---

MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs