Merge "objectcache: Remove lock()/unlock() stubs from MemcachedClient"

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

diff --git a/includes/upload/UploadFromUrl.php b/includes/upload/UploadFromUrl.php
index f5367bb..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.
  *
@@ -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();