From: Kaldari <rkaldari@wikimedia.org>
Date: Fri, 31 Aug 2012 00:06:33 +0000 (+0000)
Subject: Merge "Revert "Setting up a way to have uploading by URL, but not on Special:Upload""
X-Git-Tag: 1.31.0-rc.0~22517
X-Git-Url: https://git.cyclocoop.org/%20%27.%28%24debut%20%20%20%24par_page%29.%27?a=commitdiff_plain;h=987319a54adf9f6208534b5ac3b60d6f88bbf7e4;hp=70051c7fad1830edc774c74cb362b39105f0fb76;p=lhc%2Fweb%2Fwiklou.git

Merge "Revert "Setting up a way to have uploading by URL, but not on Special:Upload""
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e898edf059..a24081d1b8 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -526,13 +526,6 @@ $wgAllowAsyncCopyUploads = false;
  */
 $wgCopyUploadsDomains = array();
 
-/**
- * Enable copy uploads from Special:Upload. $wgAllowCopyUploads must also be
- * true. If $wgAllowCopyUploads is true, but this is false, you will only be
- * able to perform copy uploads from the API or extensions (e.g. UploadWizard).
- */
-$wgCopyUploadsFromSpecialUpload = false;
-
 /**
  * Max size for uploads, in bytes. If not set to an array, applies to all
  * uploads. If set to an array, per upload type maximums can be set, using the
diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index ac54faa679..43ea345b74 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -789,8 +789,6 @@ class UploadForm extends HTMLForm {
 	 * @return Array: descriptor array
 	 */
 	protected function getSourceSection() {
-		global $wgCopyUploadsFromSpecialUpload;
-
 		if ( $this->mSessionKey ) {
 			return array(
 				'SessionKey' => array(
@@ -804,9 +802,7 @@ class UploadForm extends HTMLForm {
 			);
 		}
 
-		$canUploadByUrl = UploadFromUrl::isEnabled()
-			&& UploadFromUrl::isAllowed( $this->getUser() )
-			&& $wgCopyUploadsFromSpecialUpload;
+		$canUploadByUrl = UploadFromUrl::isEnabled() && UploadFromUrl::isAllowed( $this->getUser() );
 		$radio = $canUploadByUrl;
 		$selectedSourceType = strtolower( $this->getRequest()->getText( 'wpSourceType', 'File' ) );