Try to make POSTs as transactional as possible

[lhc/web/wiklou.git] / includes / specials / SpecialUpload.php

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 3f1ea42..44be81c 100644 (file)
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -152,6 +152,8 @@ class SpecialUpload extends SpecialPage {
         * @throws UserBlockedError
         */
        public function execute( $par ) {
+               $this->useTransactionalTimeLimit();
+
                $this->setHeaders();
                $this->outputHeader();
 
@@ -160,7 +162,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();
@@ -817,8 +819,8 @@ class UploadForm extends HTMLForm {
 
                # Add a link to edit MediaWik:Licenses
                if ( $this->getUser()->isAllowed( 'editinterface' ) ) {
-                       $licensesLink = Linker::link(
-                               Title::makeTitle( NS_MEDIAWIKI, 'Licenses' ),
+                       $licensesLink = Linker::linkKnown(
+                               $this->msg( 'licenses' )->inContentLanguage()->getTitle(),
                                $this->msg( 'licenses-edit' )->escaped(),
                                array(),
                                array( 'action' => 'edit' )