From 717f255e6149cc6a66224168a320354da8572f1c Mon Sep 17 00:00:00 2001
From: Michael Dale <dale@users.mediawiki.org>
Date: Thu, 27 Aug 2009 14:30:14 +0000
Subject: [PATCH] quick fix for r55604 broken chunk upload class abstraction

---
 includes/upload/UploadFromChunks.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/includes/upload/UploadFromChunks.php b/includes/upload/UploadFromChunks.php
index 956a39890c..f775f9215a 100644
--- a/includes/upload/UploadFromChunks.php
+++ b/includes/upload/UploadFromChunks.php
@@ -2,9 +2,9 @@
 /**
  * @file
  * @ingroup upload
- * 
+ *
  * @author Michael Dale
- * 
+ *
  * first destination checks are made (if ignorewarnings is not checked) errors / warning is returned.
  *
  * we return the uploadUrl
@@ -22,8 +22,10 @@ class UploadFromChunks extends UploadBase {
 	const INIT 	= 1;
 	const CHUNK = 2;
 	const DONE 	= 3;
-
-	function initializeFromParams( $param, &$request ) {
+	public function initializeFromRequest( &$request ){
+		//should merge initializeFromParams (but just needs to be working atm)
+	}
+	public function initializeFromParams( $param, &$request ) {
 		$this->initFromSessionKey( $param['chunksessionkey'], $request );
 		// set the chunk mode:
 		if( !$this->mSessionKey && !$param['done'] ){
@@ -46,7 +48,6 @@ class UploadFromChunks extends UploadBase {
 
 		return $this->status;
 	}
-
 	static function isValidRequest( $request ) {
 		$sessionData = $request->getSessionData( 'wsUploadData' );
 		if( !self::isValidSessionKey(
-- 
2.20.1