X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fparser%2FParser.php;h=4f579a93be6bfb20df73f036535e69409c0141a7;hb=2e7f4e48735b0e916336d9166cb1ab1756e0fa9f;hp=f9eea48798589e8c3c0ed8a1b22e3354fcd4373d;hpb=ef06c85d9b4e260ce586e546a35648ae35f3e24a;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index f9eea48798..4f579a93be 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -251,7 +251,7 @@ class Parser { protected $mProfiler; /** - * @var LinkRenderer + * @var \MediaWiki\Linker\LinkRenderer */ protected $mLinkRenderer; @@ -882,10 +882,10 @@ class Parser { } /** - * Get a LinkRenderer instance to make links with + * Get a \MediaWiki\Linker\LinkRenderer instance to make links with * * @since 1.28 - * @return LinkRenderer + * @return \MediaWiki\Linker\LinkRenderer */ public function getLinkRenderer() { if ( !$this->mLinkRenderer ) { @@ -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 ); }