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

This reverts commit 8c6c29b3fc5db93c46bdd73b48f1ff5b4edad25c

I erroneously assumed there was a practical reason why
wgAllowCopyUploads was turned off on Commons, i.e. it was
too easy to abuse, causing too many copyvios, etc. I didn't
realize that the reason it was turned off was purely
technical (since the apaches on the cluster have no
external internet access). So there's no reason we need a
separate config.

Change-Id: I293a59d756335909898fd647edd6eddb68f06e17

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 410dc54..76cfba6 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -524,13 +524,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 b8f150d..3072408 100644 (file)
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -798,8 +798,6 @@ class UploadForm extends HTMLForm {
         * @return Array: descriptor array
         */
        protected function getSourceSection() {
-               global $wgCopyUploadsFromSpecialUpload;
-
                if ( $this->mSessionKey ) {
                        return array(
                                'SessionKey' => array(
@@ -813,9 +811,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' ) );