From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 17 Aug 2016 19:22:19 +0000 (-0700)
Subject: Remove pointless override of doStashFile in UploadFromStash
X-Git-Tag: 1.31.0-rc.0~6017^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=7d19b4820ed0bd605f806c161b3567c9e25a470f;p=lhc%2Fweb%2Fwiklou.git

Remove pointless override of doStashFile in UploadFromStash

Change-Id: If6bc31d7398c68320a6633b045c33279bf6f8dbd
---

diff --git a/includes/upload/UploadFromStash.php b/includes/upload/UploadFromStash.php
index 50bcbc4260..1fbdb7d86d 100644
--- a/includes/upload/UploadFromStash.php
+++ b/includes/upload/UploadFromStash.php
@@ -143,24 +143,6 @@ class UploadFromStash extends UploadBase {
 		return $this->mFileProps['sha1'];
 	}
 
-	/*
-	 * protected function verifyFile() inherited
-	 */
-
-	/**
-	 * Stash the file.
-	 *
-	 * @param User $user
-	 * @return UploadStashFile
-	 */
-	protected function doStashFile( User $user = null ) {
-		// replace mLocalFile with an instance of UploadStashFile, which adds some methods
-		// that are useful for stashed files.
-		$this->mLocalFile = parent::doStashFile( $user );
-
-		return $this->mLocalFile;
-	}
-
 	/**
 	 * Remove a temporarily kept file stashed by saveTempUploadedFile().
 	 * @return bool Success