From b20a0d33275bb5fe7ee3244cc762a21b940ef547 Mon Sep 17 00:00:00 2001 From: Bryan Tong Minh Date: Sun, 6 Feb 2011 22:53:07 +0000 Subject: [PATCH] Follow-up r81612, disable $wgAllowAsyncCopyUploads --- includes/DefaultSettings.php | 2 +- includes/upload/UploadFromUrl.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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 -- 2.20.1