X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fdiff%2FDifferenceEngine.php;h=513865576372931e769f2e37c79511fe61ac2a1a;hb=90d4f56fe46140f9e97e2fa72698f98b57447fe5;hp=aa0a1f782f2cb4747bfef1cc9ef1efe00d5ea2b2;hpb=55ffac2024448afd1c73c56fdd369c0f67409afb;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index aa0a1f782f..5138655763 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -992,8 +992,6 @@ class DifferenceEngine extends ContextSource { * @return bool|string */ protected function textDiff( $otext, $ntext ) { - global $wgContLang; - $otext = str_replace( "\r\n", "\n", $otext ); $ntext = str_replace( "\r\n", "\n", $ntext ); @@ -1067,11 +1065,12 @@ class DifferenceEngine extends ContextSource { } # Native PHP diff - $ota = explode( "\n", $wgContLang->segmentForDiff( $otext ) ); - $nta = explode( "\n", $wgContLang->segmentForDiff( $ntext ) ); + $contLang = MediaWikiServices::getInstance()->getContentLanguage(); + $ota = explode( "\n", $contLang->segmentForDiff( $otext ) ); + $nta = explode( "\n", $contLang->segmentForDiff( $ntext ) ); $diffs = new Diff( $ota, $nta ); $formatter = new TableDiffFormatter(); - $difftext = $wgContLang->unsegmentForDiff( $formatter->format( $diffs ) ); + $difftext = $contLang->unsegmentForDiff( $formatter->format( $diffs ) ); $difftext .= $this->debug( 'native PHP' ); return $difftext;