X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fspecials%2Fforms%2FUploadForm.php;h=be2841749b950851249f9668711dbdc548a9e1fe;hp=e37200f60fe59905f3e2d01e48e24dd2f8891d2a;hb=a3cd158d8433e41cbeb299f0e268dfef363b2afd;hpb=2dd32981a8326a6207ac866b39410f1b86179288

diff --git a/includes/specials/forms/UploadForm.php b/includes/specials/forms/UploadForm.php
index e37200f60f..be2841749b 100644
--- a/includes/specials/forms/UploadForm.php
+++ b/includes/specials/forms/UploadForm.php
@@ -260,12 +260,11 @@ class UploadForm extends HTMLForm {
 				$file = null;
 			}
 			if ( $file ) {
-				global $wgContLang;
-
 				$mto = $file->transform( [ 'width' => 120 ] );
 				if ( $mto ) {
 					$this->addHeaderText(
-						'<div class="thumb t' . $wgContLang->alignEnd() . '">' .
+						'<div class="thumb t' .
+						MediaWikiServices::getInstance()->getContentLanguage()->alignEnd() . '">' .
 						Html::element( 'img', [
 							'src' => $mto->getUrl(),
 							'class' => 'thumbimage',
@@ -394,7 +393,7 @@ class UploadForm extends HTMLForm {
 	 */
 	public function show() {
 		$this->addUploadJS();
-		parent::show();
+		return parent::show();
 	}
 
 	/**
@@ -416,7 +415,8 @@ class UploadForm extends HTMLForm {
 			'wgCheckFileExtensions' => $config->get( 'CheckFileExtensions' ),
 			'wgStrictFileExtensions' => $config->get( 'StrictFileExtensions' ),
 			'wgFileExtensions' => array_values( array_unique( $config->get( 'FileExtensions' ) ) ),
-			'wgCapitalizeUploads' => MWNamespace::isCapitalized( NS_FILE ),
+			'wgCapitalizeUploads' => MediaWikiServices::getInstance()->getNamespaceInfo()->
+				isCapitalized( NS_FILE ),
 			'wgMaxUploadSize' => $this->mMaxUploadSize,
 			'wgFileCanRotate' => SpecialUpload::rotationEnabled(),
 		];