Make the UploadStash repo specific by creating FileRepo::getUploadStash(). In practic...

diff --git a/includes/api/ApiQueryStashImageInfo.php b/includes/api/ApiQueryStashImageInfo.php
index 73bad15..bcd8196 100644 (file)
--- a/includes/api/ApiQueryStashImageInfo.php
+++ b/includes/api/ApiQueryStashImageInfo.php
@@ -42,7 +42,7 @@ class ApiQueryStashImageInfo extends ApiQueryImageInfo {
                $result = $this->getResult();
 
                try {
-                       $stash = new UploadStash();
+                       $stash = RepoGroup::singleton()->getLocalRepo()->getUploadStash();
 
                        foreach ( $params['sessionkey'] as $sessionkey ) {
                                $file = $stash->getFile( $sessionkey );

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index a3931f2..386274a 100644 (file)
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -691,4 +691,11 @@ abstract class FileRepo {
                array_unshift( $args, 'filerepo', $this->getName() );
                return call_user_func_array( 'wfMemcKey', $args );
        }
+       
+       /**
+        * Get an UploadStash associated with this repo.
+        */
+       function getUploadStash() {
+               return new UploadStash( $this );
+       }
 }

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index f239edf..b0de13e 100644 (file)
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -939,7 +939,7 @@ class UploadForm extends HTMLForm {
                global $wgUser;
 
                if ( $this->mSessionKey ) {
-                       $stash = new UploadStash;
+                       $stash = RepoGroup::singleton()->getLocalRepo()->getUploadStash();
                        try {
                                $file = $stash->getFile( $this->mSessionKey );
                        } catch ( MWException $e ) {

diff --git a/includes/specials/SpecialUploadStash.php b/includes/specials/SpecialUploadStash.php
index 58b174f..2f0335b 100644 (file)
--- a/includes/specials/SpecialUploadStash.php
+++ b/includes/specials/SpecialUploadStash.php
@@ -41,7 +41,7 @@ class SpecialUploadStash extends UnlistedSpecialPage {
 
                parent::__construct( 'UploadStash', 'upload' );
                try {
-                       $this->stash = new UploadStash( );
+                       $this->stash = RepoGroup::singleton()->getLocalRepo()->getUploadStash();
                } catch ( UploadStashNotAvailableException $e ) {
                        return null;
                }

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 25a2b9d..b48cecb 100644 (file)
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -643,7 +643,7 @@ abstract class UploadBase {
         * @return File: stashed file
         */
        public function stashSessionFile( $key = null ) { 
-               $stash = new UploadStash();
+               $stash = RepoGroup::singleton()->getLocalRepo()->getUploadStash();;
                $data = array( 
                        'mFileProps' => $this->mFileProps,
                        'mSourceType' => $this->getSourceType(),

diff --git a/includes/upload/UploadStash.php b/includes/upload/UploadStash.php
index 1a13859..8dd2c76 100644 (file)
--- a/includes/upload/UploadStash.php
+++ b/includes/upload/UploadStash.php
@@ -31,10 +31,10 @@ class UploadStash {
         * Represents the session which contains temporarily stored files.
         * Designed to be compatible with the session stashing code in UploadBase (should replace it eventually)
         */
-       public function __construct() { 
+       public function __construct( $repo ) { 
 
                // this might change based on wiki's configuration.
-               $this->repo = RepoGroup::singleton()->getLocalRepo();
+               $this->repo = $repo;
 
                if ( ! isset( $_SESSION ) ) {
                        throw new UploadStashNotAvailableException( 'no session variable' );