Update to MediaWiki 1.22.0

1 files changed, 6 insertions, 1 deletions

diff --git a/includes/job/jobs/UploadFromUrlJob.php b/includes/job/jobs/UploadFromUrlJob.php
index 87549140..c993cfb4 100644
--- a/includes/job/jobs/UploadFromUrlJob.php
+++ b/includes/job/jobs/UploadFromUrlJob.php
@@ -48,6 +48,7 @@ class UploadFromUrlJob extends Job {
 	}
 
 	public function run() {
+		global $wgCopyUploadAsyncTimeout;
 		# Initialize this object and the upload object
 		$this->upload = new UploadFromUrl();
 		$this->upload->initialize(
@@ -58,7 +59,11 @@ class UploadFromUrlJob extends Job {
 		$this->user = User::newFromName( $this->params['userName'] );
 
 		# Fetch the file
-		$status = $this->upload->fetchFile();
+		$opts = array();
+		if ( $wgCopyUploadAsyncTimeout ) {
+			$opts['timeout'] = $wgCopyUploadAsyncTimeout;
+		}
+		$status = $this->upload->fetchFile( $opts );
 		if ( !$status->isOk() ) {
 			$this->leaveMessage( $status );
 			return true;