From df3952f11062b5b8a0244ae14bc932327540ef6a Mon Sep 17 00:00:00 2001 From: Bryan Tong Minh Date: Fri, 26 Sep 2008 20:06:23 +0000 Subject: [PATCH] Add a real fetchFile() method. --- includes/UploadBase.php | 7 +++++++ includes/UploadFromUrl.php | 9 ++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/includes/UploadBase.php b/includes/UploadBase.php index e137ee54ea..42fbe7221a 100644 --- 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 b908032d65..7e23b8cd37 100644 --- 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 */ -- 2.20.1