Merge "Fix double quote to apostrophe in a message"

[lhc/web/wiklou.git] / includes / jobqueue / jobs / UploadFromUrlJob.php

diff --git a/includes/jobqueue/jobs/UploadFromUrlJob.php b/includes/jobqueue/jobs/UploadFromUrlJob.php
index 480246b..d15fd02 100644 (file)
--- a/includes/jobqueue/jobs/UploadFromUrlJob.php
+++ b/includes/jobqueue/jobs/UploadFromUrlJob.php
@@ -81,7 +81,7 @@ class UploadFromUrlJob extends Job {
                        if ( $warnings ) {
 
                                # Stash the upload
-                               $key = $this->upload->stashFile();
+                               $key = $this->upload->stashFile( $this->user );
 
                                // @todo FIXME: This has been broken for a while.
                                // User::leaveUserMessage() does not exist.
@@ -155,8 +155,8 @@ class UploadFromUrlJob extends Job {
         * Store a result in the session data. Note that the caller is responsible
         * for appropriate session_start and session_write_close calls.
         *
-        * @param string $result the result (Success|Warning|Failure)
-        * @param string $dataKey the key of the extra data
+        * @param string $result The result (Success|Warning|Failure)
+        * @param string $dataKey The key of the extra data
         * @param mixed $dataValue The extra data itself
         */
        protected function storeResultInSession( $result, $dataKey, $dataValue ) {