registration: Avoid redundant LBYL check in ExtensionRegistry::queue()

[lhc/web/wiklou.git] / includes / upload / UploadFromUrl.php

diff --git a/includes/upload/UploadFromUrl.php b/includes/upload/UploadFromUrl.php
index 865f630..b92fcc5 100644 (file)
--- a/includes/upload/UploadFromUrl.php
+++ b/includes/upload/UploadFromUrl.php
@@ -1,4 +1,7 @@
 <?php
+
+use MediaWiki\MediaWikiServices;
+
 /**
  * Backend for uploading files from a HTTP resource.
  *
@@ -141,7 +144,7 @@ class UploadFromUrl extends UploadBase {
 
        /**
         * Entry point for SpecialUpload
-        * @param WebRequest $request
+        * @param WebRequest &$request
         */
        public function initializeFromRequest( &$request ) {
                $desiredDestName = $request->getText( 'wpDestFile' );
@@ -150,8 +153,7 @@ class UploadFromUrl extends UploadBase {
                }
                $this->initialize(
                        $desiredDestName,
-                       trim( $request->getVal( 'wpUploadFileURL' ) ),
-                       false
+                       trim( $request->getVal( 'wpUploadFileURL' ) )
                );
        }
 
@@ -202,7 +204,8 @@ class UploadFromUrl extends UploadBase {
         * @return string Path to the file
         */
        protected function makeTemporaryFile() {
-               $tmpFile = TempFSFile::factory( 'URL', 'urlupload_', wfTempDir() );
+               $tmpFile = MediaWikiServices::getInstance()->getTempFSFileFactory()
+                       ->newTempFSFile( 'URL', 'urlupload_' );
                $tmpFile->bind( $this );
 
                return $tmpFile->getPath();
@@ -225,7 +228,7 @@ class UploadFromUrl extends UploadBase {
                        // Well... that's not good!
                        wfDebugLog(
                                'fileupload',
-                               'Short write ' . $this->nbytes . '/' . strlen( $buffer ) .
+                               'Short write ' . $nbytes . '/' . strlen( $buffer ) .
                                        ' bytes, aborting with ' . $this->mFileSize . ' uploaded so far'
                        );
                        fclose( $this->mTmpHandle );
@@ -287,7 +290,7 @@ class UploadFromUrl extends UploadBase {
 
                wfDebugLog( 'fileupload', $status );
                if ( $status->isOK() ) {
-                       wfDebugLog( 'fileupload', 'Download by URL completed successfuly.' );
+                       wfDebugLog( 'fileupload', 'Download by URL completed successfully.' );
                } else {
                        wfDebugLog(
                                'fileupload',