X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fcontent%2FContentHandler.php;h=65a7b7daac88f9e57a4e25a56184842bd77ec874;hb=8ffabe23a195e47af2a117a2a917a280b3459255;hp=decbb0c5d84e5595f562e351024add89c7cf7a89;hpb=43a0144346da4e6edbbadee0b7d9def53357bc10;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php
index decbb0c5d8..65a7b7daac 100644
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Base class for content handling.
  *
@@ -645,9 +646,6 @@ abstract class ContentHandler {
 		$slotDiffRenderer->setStatsdDataFactory( $statsdDataFactory );
 		// XXX using the page language would be better, but it's unclear how that should be injected
 		$slotDiffRenderer->setLanguage( $contentLanguage );
-		$slotDiffRenderer->setWikiDiff2MovedParagraphDetectionCutoff(
-			$context->getConfig()->get( 'WikiDiff2MovedParagraphDetectionCutoff' )
-		);
 
 		$engine = DifferenceEngine::getEngine();
 		if ( $engine === false ) {
@@ -690,6 +688,10 @@ abstract class ContentHandler {
 			$pageLang = Language::factory( $lang );
 		}
 
+		// Simplify hook handlers by only passing objects of one type, in case nothing
+		// else has unstubbed the StubUserLang object by now.
+		StubObject::unstub( $wgLang );
+
 		Hooks::run( 'PageContentLanguage', [ $title, &$pageLang, $wgLang ] );
 
 		return wfGetLangObj( $pageLang );