Merge "UploadFromStash: Only remove stashed file on successful uploads"

diff --git a/includes/upload/UploadFromStash.php b/includes/upload/UploadFromStash.php
index 75540c1..1276842 100644 (file)
--- a/includes/upload/UploadFromStash.php
+++ b/includes/upload/UploadFromStash.php
@@ -178,17 +178,10 @@ class UploadFromStash extends UploadBase {
        }
 
        /**
-        * Perform the upload, then remove the database record afterward.
-        * @param string $comment
-        * @param string $pageText
-        * @param bool $watch
-        * @param User $user
-        * @return Status
+        * Remove the database record after a successful upload.
         */
-       public function performUpload( $comment, $pageText, $watch, $user ) {
-               $rv = parent::performUpload( $comment, $pageText, $watch, $user );
+       public function postProcessUpload() {
+               parent::postProcessUpload();
                $this->unsaveUploadedFile();
-
-               return $rv;
        }
 }