From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 4 Jun 2015 07:31:04 +0200 Subject: Update to MediaWiki 1.25.1 --- includes/upload/UploadFromChunks.php | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'includes/upload/UploadFromChunks.php') diff --git a/includes/upload/UploadFromChunks.php b/includes/upload/UploadFromChunks.php index 14993023..cc9f5c85 100644 --- a/includes/upload/UploadFromChunks.php +++ b/includes/upload/UploadFromChunks.php @@ -77,7 +77,7 @@ class UploadFromChunks extends UploadFromFile { $this->verifyChunk(); // Create a local stash target - $this->mLocalFile = parent::stashFile(); + $this->mLocalFile = parent::stashFile( $user ); // Update the initial file offset (based on file size) $this->mOffset = $this->mLocalFile->getSize(); $this->mFileKey = $this->mLocalFile->getFileKey(); @@ -170,20 +170,6 @@ class UploadFromChunks extends UploadFromFile { return $status; } - /** - * Perform the upload, then remove the temp copy afterward - * @param string $comment - * @param string $pageText - * @param bool $watch - * @param User $user - * @return Status - */ - public function performUpload( $comment, $pageText, $watch, $user ) { - $rv = parent::performUpload( $comment, $pageText, $watch, $user ); - - return $rv; - } - /** * Returns the virtual chunk location: * @param int $index @@ -303,10 +289,10 @@ class UploadFromChunks extends UploadFromFile { } /** - * Gets the current offset in fromt the stashedupload table + * Get the offset at which the next uploaded chunk will be appended to * @return int Current byte offset of the chunk file set */ - private function getOffset() { + public function getOffset() { if ( $this->mOffset !== null ) { return $this->mOffset; } -- cgit v1.2.3-54-g00ecf