X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialUpload.php;h=1618527284a0e531bed06ff3010f6c5d993bd0f8;hb=d864012f338917db791c234675ab7a5b427ade98;hp=8390feb083b63cf44c45658115fd30e71416b62f;hpb=d7e93ff4e7856aaee559bcd1f03acc439c8cd1f6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 8390feb083..1618527284 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -160,7 +160,7 @@ class SpecialUpload extends SpecialPage {
 			throw new ErrorPageError( 'uploaddisabled', 'uploaddisabledtext' );
 		}
 
-		$this->getOutput()->addHelpLink( 'Help:Managing files' );
+		$this->addHelpLink( 'Help:Managing files' );
 
 		# Check permissions
 		$user = $this->getUser();
@@ -787,7 +787,10 @@ class UploadForm extends HTMLForm {
 	protected $mMaxUploadSize = array();
 
 	public function __construct( array $options = array(), IContextSource $context = null ) {
-		$this->setContext( $context );
+		if ( $context instanceof IContextSource ) {
+			$this->setContext( $context );
+		}
+
 		$this->mWatch = !empty( $options['watch'] );
 		$this->mForReUpload = !empty( $options['forreupload'] );
 		$this->mSessionKey = isset( $options['sessionkey'] ) ? $options['sessionkey'] : '';
@@ -815,7 +818,7 @@ class UploadForm extends HTMLForm {
 		# Add a link to edit MediaWik:Licenses
 		if ( $this->getUser()->isAllowed( 'editinterface' ) ) {
 			$licensesLink = Linker::link(
-				Title::makeTitle( NS_MEDIAWIKI, 'Licenses' ),
+				$this->msg( 'licenses' )->inContentLanguage()->getTitle(),
 				$this->msg( 'licenses-edit' )->escaped(),
 				array(),
 				array( 'action' => 'edit' )