Follow-up r81612, disable $wgAllowAsyncCopyUploads

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index ae1ebb0..c7988c6 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -434,7 +434,7 @@ $wgCacheSharedUploads = true;
 $wgAllowCopyUploads = false;
 /**
  * Allow asynchronous copy uploads.
- * This feature is experimental.
+ * This feature is experimental is broken as of r81612.
  */
 $wgAllowAsyncCopyUploads = false;
 

diff --git a/includes/upload/UploadFromUrl.php b/includes/upload/UploadFromUrl.php
index 7acb051..93a2b0b 100644 (file)
--- a/includes/upload/UploadFromUrl.php
+++ b/includes/upload/UploadFromUrl.php
@@ -45,6 +45,9 @@ class UploadFromUrl extends UploadBase {
 
                $this->mUrl = $url;
                $this->mAsync = $wgAllowAsyncCopyUploads ? $async : false;
+               if ( $async ) {
+                       throw new MWException( 'Asynchronous copy uploads are no longer possible as of r81612.' );
+               }
 
                $tempPath = $this->mAsync ? null : $this->makeTemporaryFile();
                # File size and removeTempFile will be filled in later