From 17874681eab6069a7125c8bce3b7f5b24ee63e0d Mon Sep 17 00:00:00 2001
From: Michael Dale <dale@users.mediawiki.org>
Date: Thu, 17 Sep 2009 19:13:23 +0000
Subject: [PATCH] * some clean up and defined append function in other repo
 types

---
 includes/filerepo/FileRepo.php       | 2 ++
 includes/filerepo/ForeignAPIRepo.php | 3 +++
 includes/filerepo/NullRepo.php       | 3 +++
 includes/upload/UploadBase.php       | 6 +++---
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 60f4c2200c..c11a23faf0 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -388,6 +388,8 @@ abstract class FileRepo {
 	 */
 	abstract function storeTemp( $originalName, $srcPath );
 
+	abstract function append( $srcPath, $toAppendPath );
+	
 	/**
 	 * Remove a temporary file or mark it for garbage collection
 	 * @param string $virtualUrl The virtual URL returned by storeTemp
diff --git a/includes/filerepo/ForeignAPIRepo.php b/includes/filerepo/ForeignAPIRepo.php
index 0fb5097201..a569fa5f9b 100644
--- a/includes/filerepo/ForeignAPIRepo.php
+++ b/includes/filerepo/ForeignAPIRepo.php
@@ -52,6 +52,9 @@ class ForeignAPIRepo extends FileRepo {
 	function storeTemp( $originalName, $srcPath ) {
 		return false;
 	}
+	function append( $srcPath, $toAppendPath ){
+		return false;
+	}
 	function publishBatch( $triplets, $flags = 0 ) {
 		return false;
 	}
diff --git a/includes/filerepo/NullRepo.php b/includes/filerepo/NullRepo.php
index 030c3363cb..f5784986e6 100644
--- a/includes/filerepo/NullRepo.php
+++ b/includes/filerepo/NullRepo.php
@@ -14,6 +14,9 @@ class NullRepo extends FileRepo {
 	function storeTemp( $originalName, $srcPath ) {
 		return false;
 	}
+	function append( $srcPath, $toAppendPath ){
+		return false;
+	}
 	function publishBatch( $triplets, $flags = 0 ) {
 		return false;
 	}
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 7f134db5a0..09d0a37961 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -470,13 +470,13 @@ abstract class UploadBase {
 	 * can accumulate in the temp directory.
 	 *
 	 * @param string $saveName - the destination filename
-	 * @param string $tempName - the source temporary file to save
+	 * @param string $tempSrc - the source temporary file to save
 	 * @return string - full path the stashed file, or false on failure
 	 * @access private
 	 */
-	protected function saveTempUploadedFile( $saveName, $tempName ) {
+	protected function saveTempUploadedFile( $saveName, $tempSrc ) {
 		$repo = RepoGroup::singleton()->getLocalRepo();
-		$status = $repo->storeTemp( $saveName, $tempName );
+		$status = $repo->storeTemp( $saveName, $tempSrc );
 		return $status;
 	}
 
-- 
2.20.1