Revert r76177 and use AutoLoader

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index f93c0ad..c3c3739 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -671,11 +671,16 @@ $wgAutoloadLocalClasses = array(
        'UserloginTemplate' => 'includes/templates/Userlogin.php',
 
        # includes/upload
-       'UploadStash' => 'includes/upload/UploadStash.php',
        'UploadBase' => 'includes/upload/UploadBase.php',
        'UploadFromStash' => 'includes/upload/UploadFromStash.php',
        'UploadFromFile' => 'includes/upload/UploadFromFile.php',
        'UploadFromUrl' => 'includes/upload/UploadFromUrl.php',
+       'UploadStash' => 'includes/upload/UploadStash.php',
+       'UploadStashNotAvailableException' => 'includes/upload/UploadStash.php',
+       'UploadStashFileNotFoundException' => 'includes/upload/UploadStash.php',
+       'UploadStashBadPathException' => 'includes/upload/UploadStash.php',
+       'UploadStashBadVersionException' => 'includes/upload/UploadStash.php',
+       'UploadStashFileException' => 'includes/upload/UploadStash.php',
 
        # languages
        'Language' => 'languages/Language.php',

diff --git a/includes/specials/SpecialUploadStash.php b/includes/specials/SpecialUploadStash.php
index 73ab6a2..64e59b6 100644 (file)
--- a/includes/specials/SpecialUploadStash.php
+++ b/includes/specials/SpecialUploadStash.php
@@ -16,8 +16,6 @@
  * @ingroup Upload
  */
 
-require dirname( __FILE__ ) . '/../upload/UploadStash.php';
-
 class SpecialUploadStash extends SpecialPage {
 
        static $HttpErrors = array( // FIXME: Use OutputPage::getStatusMessage() --RK