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

TextContent: Normalize newlines in preSaveTransform()

Browse source 
This does the same normalization of newlines that
Parser::preSaveTransform() does. This should be appropriate for any text
content type, especially considering that EditPage uses
WebRequest::getText() which does a less-strict version of this same
transformation.

This also cleans up the code for doing that newline replacement
to be a bit less verbose.

Bug: T142805
Change-Id: I462afcda502f031a8b0360d982ce2398a0383a96
This commit is contained in:
Brad Jorsch 2016-08-15 11:26:44 -04:00
parent a979689003
commit 96b6afb31d
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
includes/content/TextContent.php
View file

@ -149,7 +149,7 @@ class TextContent extends AbstractContent {
/**
* Returns a Content object with pre-save transformations applied.
* This implementation just trims trailing whitespace.
* This implementation just trims trailing whitespace and normalizes newlines.
*
* @param Title $title
* @param User $user
@ -160,6 +160,7 @@ class TextContent extends AbstractContent {
public function preSaveTransform( Title $title, User $user, ParserOptions $popts ) {
$text = $this->getNativeData();
$pst = rtrim( $text );
$pst = str_replace( [ "\r\n", "\r" ], "\n", $pst );
return ( $text === $pst ) ? $this : new static( $pst, $this->getModel() );
}

6
includes/parser/Parser.php
View file

@ -4364,11 +4364,7 @@ class Parser {
$this->startParse( $title, $options, self::OT_WIKI, $clearState );
$this->setUser( $user );
$pairs = [
"\r\n" => "\n",
"\r" => "\n",
];
$text = str_replace( array_keys( $pairs ), array_values( $pairs ), $text );
$text = str_replace( [ "\r\n", "\r" ], "\n", $text );
if ( $options->getPreSaveTransform() ) {
$text = $this->pstPass2( $text, $user );
}

5
tests/phpunit/includes/content/TextContentTest.php
View file

@ -102,6 +102,11 @@ class TextContentTest extends MediaWikiLangTestCase {
" Foo \n ",
' Foo',
],
[
# 2: newline normalization
"LF\n\nCRLF\r\n\r\nCR\r\rEND",
"LF\n\nCRLF\n\nCR\n\nEND",
],
];
}