Merge "Document how LocalFile::upload() and UploadBase::performUpload() ignore user...

diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index 82d6a76..6d8f0b8 100644 (file)
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1120,6 +1120,7 @@ class LocalFile extends File {
         *   current time
         * @param User|null $user User object or null to use $wgUser
         * @param string[] $tags Change tags to add to the log entry and page revision.
+        *   (This doesn't check $user's permissions.)
         * @return FileRepoStatus On success, the value member contains the
         *     archive name, or an empty string if it was a new file.
         */

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index ad26f7d..4294408 100644 (file)
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -690,9 +690,11 @@ abstract class UploadBase {
         *
         * @param string $comment
         * @param string $pageText
-        * @param bool $watch
+        * @param bool $watch Whether the file page should be added to user's watchlist.
+        *   (This doesn't check $user's permissions.)
         * @param User $user
         * @param string[] $tags Change tags to add to the log entry and page revision.
+        *   (This doesn't check $user's permissions.)
         * @return Status Indicating the whether the upload succeeded.
         */
        public function performUpload( $comment, $pageText, $watch, $user, $tags = array() ) {