From: Bryan Tong Minh <btongminh@users.mediawiki.org>
Date: Sun, 6 Feb 2011 22:53:07 +0000 (+0000)
Subject: Follow-up r81612, disable $wgAllowAsyncCopyUploads
X-Git-Tag: 1.31.0-rc.0~32148
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=b20a0d33275bb5fe7ee3244cc762a21b940ef547;p=lhc%2Fweb%2Fwiklou.git

Follow-up r81612, disable $wgAllowAsyncCopyUploads
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index ae1ebb0067..c7988c6c43 100644
--- 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 7acb051087..93a2b0b322 100644
--- 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