(Bug 15936) New page's patrol button should always be visible

[lhc/web/wiklou.git] / includes / UploadFromUpload.php

diff --git a/includes/UploadFromUpload.php b/includes/UploadFromUpload.php
index 31cd02d..1b6762c 100644 (file)
--- a/includes/UploadFromUpload.php
+++ b/includes/UploadFromUpload.php
@@ -1,12 +1,20 @@
 <?php
 
-class UploadFromUpload extends UploadFromBase {
-       function initialize( $tempPath, $fileSize, $fileName ) {
-               $this->mTempPath       = $tempPath;
-               $this->mFileSize       = $fileSize;
-               $this->mSrcName        = $fileName;
-               $this->mSessionKey     = false;
-               $this->mStashed        = false;
-               $this->mRemoveTempFile = false; // PHP will handle this
+class UploadFromUpload extends UploadBase {
+
+       function initializeFromRequest( &$request ) {
+               $desiredDestName = $request->getText( 'wpDestFile' );
+               if( !$desiredDestName )
+                       $desiredDestName = $request->getText( 'wpUploadFile' );
+               
+               return $this->initialize( 
+                       $desiredDestName, 
+                       $request->getFileTempName( 'wpUploadFile' ), 
+                       $request->getFileSize( 'wpUploadFile' ) 
+               );
+       }
+       
+       static function isValidRequest( $request ) {
+               return (bool)$request->getFileTempName( 'wpUploadFile' );
        }
 }