Add a real fetchFile() method.

diff --git a/includes/UploadBase.php b/includes/UploadBase.php
index e137ee5..42fbe72 100644 (file)
--- a/includes/UploadBase.php
+++ b/includes/UploadBase.php
@@ -75,6 +75,13 @@ class UploadBase {
                $this->mRemoveTempFile = $removeTempFile;
        }
 
+       /**
+        * Fetch the file. Usually a no-op
+        */
+       function fetchFile() {
+               return self::OK;
+       }
+
        function verifyUpload() {
                global $wgUser;
                

diff --git a/includes/UploadFromUrl.php b/includes/UploadFromUrl.php
index b908032..7e23b8c 100644 (file)
--- a/includes/UploadFromUrl.php
+++ b/includes/UploadFromUrl.php
@@ -20,7 +20,10 @@ class UploadFromUrl extends UploadBase {
                $this->mUrl = trim( $url );
        }
        
-       function verifyUpload() {
+       /**
+        * Do the real fetching stuff
+        */
+       function fetchFile() {
                if( stripos($this->mUrl, 'http://') !== 0 && stripos($this->mUrl, 'ftp://') !== 0 ) {
                        return array(
                                'status' => self::BEFORE_PROCESSING,
@@ -34,10 +37,10 @@ class UploadFromUrl extends UploadBase {
                                'error' => $res,
                        );
                }
-               return parent::verifyUpload();
+               return self::OK;
        }
        
-               /**
+       /**
         * Safe copy from URL
         * Returns true if there was an error, false otherwise
         */