X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Ffilerepo%2FFileRepo.php;h=51cef8102956e3b1720a75d76f885b04dcb1a952;hb=4339d71ed4c144b53b70aa3e048c3276dfd5bd61;hp=3225625b6fc49220b19a58ffc1869f0efe25ed1b;hpb=93350da7f1ab397b87c3ac3073ddfc1c857b272e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 3225625b6f..51cef81029 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -176,7 +176,8 @@ class FileRepo {
 		}
 
 		// Optional settings that have a default
-		$this->initialCapital = $info['initialCapital'] ?? MWNamespace::isCapitalized( NS_FILE );
+		$this->initialCapital = $info['initialCapital'] ??
+			MediaWikiServices::getInstance()->getNamespaceInfo()->isCapitalized( NS_FILE );
 		$this->url = $info['url'] ?? false; // a subclass may set the URL (e.g. ForeignAPIRepo)
 		if ( isset( $info['thumbUrl'] ) ) {
 			$this->thumbUrl = $info['thumbUrl'];
@@ -645,7 +646,10 @@ class FileRepo {
 	 * @return string
 	 */
 	public function getNameFromTitle( Title $title ) {
-		if ( $this->initialCapital != MWNamespace::isCapitalized( NS_FILE ) ) {
+		if (
+			$this->initialCapital !=
+			MediaWikiServices::getInstance()->getNamespaceInfo()->isCapitalized( NS_FILE )
+		) {
 			$name = $title->getUserCaseDBKey();
 			if ( $this->initialCapital ) {
 				$name = MediaWikiServices::getInstance()->getContentLanguage()->ucfirst( $name );
@@ -1630,18 +1634,6 @@ class FileRepo {
 		return $status;
 	}
 
-	/**
-	 * Attempt to stream a file with the given virtual URL/storage path
-	 *
-	 * @deprecated since 1.26, use streamFileWithStatus
-	 * @param string $virtualUrl
-	 * @param array $headers Additional HTTP headers to send on success
-	 * @return bool Success
-	 */
-	public function streamFile( $virtualUrl, $headers = [] ) {
-		return $this->streamFileWithStatus( $virtualUrl, $headers )->isOK();
-	}
-
 	/**
 	 * Call a callback function for every public regular file in the repository.
 	 * This only acts on the current version of files, not any old versions.
@@ -1697,7 +1689,7 @@ class FileRepo {
 	/**
 	 * Get a callback function to use for cleaning error message parameters
 	 *
-	 * @return string[]
+	 * @return callable
 	 */
 	function getErrorCleanupFunction() {
 		switch ( $this->pathDisclosureProtection ) {