From: Jan Gerber <j@users.mediawiki.org>
Date: Thu, 22 Dec 2011 13:18:49 +0000 (+0000)
Subject: - add comment to document us_chunk_inx in sql file
X-Git-Tag: 1.31.0-rc.0~25805
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=66c64af6aad95e5660115797b390df2a942faf7e;p=lhc%2Fweb%2Fwiklou.git

- add comment to document us_chunk_inx in sql file
- fix chunk upload to work with recent filerepo changes
Follow up r104687
---

diff --git a/includes/upload/UploadFromChunks.php b/includes/upload/UploadFromChunks.php
index 3a5f8099be..1bc7e85afe 100644
--- a/includes/upload/UploadFromChunks.php
+++ b/includes/upload/UploadFromChunks.php
@@ -56,7 +56,7 @@ class UploadFromChunks extends UploadFromFile {
 		$this->mFileKey = $this->mLocalFile->getFileKey();
 
 		// Output a copy of this first to chunk 0 location:
-		$status = $this->outputChunk( $this->mLocalFile->getPath() );
+		$status = $this->outputChunk( $this->mLocalFile->getLocalRefPath() );
 		
 		// Update db table to reflect initial "chunk" state 
 		$this->updateChunkStatus();
diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 1900bbb725..3655018bf8 100644
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -966,7 +966,8 @@ CREATE TABLE /*_*/uploadstash (
 	us_timestamp varbinary(14) not null,
 
 	us_status varchar(50) not null,
-	
+
+	-- chunk counter starts at 0, current offset is stored in us_size
 	us_chunk_inx int unsigned NULL,
 
 	-- file properties from File::getPropsFromPath.  these may prove unnecessary.