From: Aryeh Gregor <ayg@aryeh.name>
Date: Wed, 14 Aug 2019 18:23:38 +0000 (+0300)
Subject: Use injected services instead of static method
X-Git-Tag: 1.34.0-rc.0~678^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=edf5f3894d1530f447877c4177db7fb3df177afb;p=lhc%2Fweb%2Fwiklou.git

Use injected services instead of static method

Depends-On: I4b915244ceee4c1857178dd68dcdf57f1ee32200
Change-Id: I053894de3665c6f8f505ee6191f2ade843db62c0
---

diff --git a/includes/title/MediaWikiTitleCodec.php b/includes/title/MediaWikiTitleCodec.php
index 5021a1c9fe..039cf4e6d6 100644
--- a/includes/title/MediaWikiTitleCodec.php
+++ b/includes/title/MediaWikiTitleCodec.php
@@ -62,7 +62,8 @@ class MediaWikiTitleCodec implements TitleFormatter, TitleParser {
 	protected $nsInfo;
 
 	/**
-	 * @param Language $language The language object to use for localizing namespace names.
+	 * @param Language $language The language object to use for localizing namespace names,
+	 *   capitalization, etc.
 	 * @param GenderCache $genderCache The gender cache for generating gendered namespace names
 	 * @param string[]|string $localInterwikis
 	 * @param InterwikiLookup|null $interwikiLookup
@@ -433,8 +434,8 @@ class MediaWikiTitleCodec implements TitleFormatter, TitleParser {
 		# and [[Foo]] point to the same place.  Don't force it for interwikis, since the
 		# other site might be case-sensitive.
 		$parts['user_case_dbkey'] = $dbkey;
-		if ( $parts['interwiki'] === '' ) {
-			$dbkey = Title::capitalize( $dbkey, $parts['namespace'] );
+		if ( $parts['interwiki'] === '' && $this->nsInfo->isCapitalized( $parts['namespace'] ) ) {
+			$dbkey = $this->language->ucfirst( $dbkey );
 		}
 
 		# Can't make a link to a namespace alone... "empty" local links can only be