X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FStatus.php;h=f17f173edc4ca9a26448cbbe5940dbf5e043a16f;hb=32bfea6c4e5a4a1dbf56a9f5a144d434adf63b3a;hp=5456ed06e34c9bb74a6553dc7ba2f1bab9184c45;hpb=23673a0ff99f4173ded689ee32dae799f2d07642;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Status.php b/includes/Status.php
index 5456ed06e3..f17f173edc 100644
--- a/includes/Status.php
+++ b/includes/Status.php
@@ -153,9 +153,12 @@ class Status extends StatusValue {
 	 * @return Language
 	 */
 	protected function languageFromParam( $lang ) {
+		global $wgLang;
+
 		if ( $lang === null ) {
-			return RequestContext::getMain()->getLanguage();
-		} elseif ( $lang instanceof Language ) {
+			// @todo: Use RequestContext::getMain()->getLanguage() instead
+			return $wgLang;
+		} elseif ( $lang instanceof Language || $lang instanceof StubUserLang ) {
 			return $lang;
 		} else {
 			return Language::factory( $lang );
@@ -313,7 +316,9 @@ class Status extends StatusValue {
 		$lang = $this->languageFromParam( $lang );
 		$text = $this->getWikiText( $shortContext, $longContext, $lang );
 		$out = MessageCache::singleton()->parse( $text, null, true, true, $lang );
-		return $out instanceof ParserOutput ? $out->getText() : $out;
+		return $out instanceof ParserOutput
+			? $out->getText( [ 'enableSectionEditLinks' => false ] )
+			: $out;
 	}
 
 	/**