* Split most of the result output code from QueryPage::doQuery() into QueryPage:...

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

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 8de5608..153cc30 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -11,6 +11,7 @@ function __autoload($className) {
                'AjaxDispatcher' => 'includes/AjaxDispatcher.php',
                'AjaxCachePolicy' => 'includes/AjaxFunctions.php',
                'AjaxResponse' => 'includes/AjaxResponse.php',
+               'AlphabeticPager' => 'includes/Pager.php',
                'Article' => 'includes/Article.php',
                'AuthPlugin' => 'includes/AuthPlugin.php',
                'BagOStuff' => 'includes/BagOStuff.php',
@@ -39,9 +40,8 @@ function __autoload($className) {
                'Database' => 'includes/Database.php',
                'DatabaseMysql' => 'includes/Database.php',
                'ResultWrapper' => 'includes/Database.php',
-               'OracleBlob' => 'includes/DatabaseOracle.php',
-               'DatabaseOracle' => 'includes/DatabaseOracle.php',
                'DatabasePostgres' => 'includes/DatabasePostgres.php',
+               'DatabaseOracle' => 'includes/DatabaseOracle.php',
                'DateFormatter' => 'includes/DateFormatter.php',
                'DifferenceEngine' => 'includes/DifferenceEngine.php',
                '_DiffOp' => 'includes/DifferenceEngine.php',
@@ -95,6 +95,7 @@ function __autoload($className) {
                'HTMLCacheUpdateJob' => 'includes/HTMLCacheUpdate.php',
                'Http' => 'includes/HttpFunctions.php',
                'Image' => 'includes/Image.php',
+               'ArchivedFile' => 'includes/Image.php',
                'IP' => 'includes/IP.php',
                'ThumbnailImage' => 'includes/Image.php',
                'ImageGallery' => 'includes/ImageGallery.php',
@@ -124,8 +125,8 @@ function __autoload($className) {
                'ReverseChronologicalPager' => 'includes/Pager.php',
                'TablePager' => 'includes/Pager.php',
                'Parser' => 'includes/Parser.php',
-               'ParserOutput' => 'includes/Parser.php',
-               'ParserOptions' => 'includes/Parser.php',
+               'ParserOutput' => 'includes/ParserOutput.php',
+               'ParserOptions' => 'includes/ParserOptions.php',
                'ParserCache' => 'includes/ParserCache.php',
                'ProfilerSimple' => 'includes/ProfilerSimple.php',
                'ProfilerSimpleUDP' => 'includes/ProfilerSimpleUDP.php',
@@ -134,6 +135,7 @@ function __autoload($className) {
                'ProtectionForm' => 'includes/ProtectionForm.php',
                'QueryPage' => 'includes/QueryPage.php',
                'PageQueryPage' => 'includes/QueryPage.php',
+               'ImageQueryPage' => 'includes/ImageQueryPage.php',
                'RawPage' => 'includes/RawPage.php',
                'RecentChange' => 'includes/RecentChange.php',
                'Revision' => 'includes/Revision.php',
@@ -148,6 +150,7 @@ function __autoload($className) {
                'SearchPostgres' => 'includes/SearchPostgres.php',
                'SearchUpdate' => 'includes/SearchUpdate.php',
                'SearchUpdateMyISAM' => 'includes/SearchUpdate.php',
+               'SearchOracle' => 'includes/SearchOracle.php',
                'SiteConfiguration' => 'includes/SiteConfiguration.php',
                'SiteStats' => 'includes/SiteStats.php',
                'SiteStatsUpdate' => 'includes/SiteStats.php',
@@ -160,7 +163,6 @@ function __autoload($className) {
                'IPBlockForm' => 'includes/SpecialBlockip.php',
                'SpecialBookSources' => 'includes/SpecialBooksources.php',
                'BrokenRedirectsPage' => 'includes/SpecialBrokenRedirects.php',
-               'CategoriesPage' => 'includes/SpecialCategories.php',
                'EmailConfirmation' => 'includes/SpecialConfirmemail.php',
                'ContributionsPage' => 'includes/SpecialContributions.php',
                'DeadendPagesPage' => 'includes/SpecialDeadendpages.php',
@@ -173,7 +175,6 @@ function __autoload($className) {
                'ImportStreamSource' => 'includes/SpecialImport.php',
                'IPUnblockForm' => 'includes/SpecialIpblocklist.php',
                'ListredirectsPage' => 'includes/SpecialListredirects.php',
-               'ListUsersPage' => 'includes/SpecialListusers.php',
                'DBLockForm' => 'includes/SpecialLockdb.php',
                'LogReader' => 'includes/SpecialLog.php',
                'LogViewer' => 'includes/SpecialLog.php',
@@ -242,6 +243,7 @@ function __autoload($className) {
                'UserloginTemplate' => 'includes/templates/Userlogin.php',
                'Language' => 'languages/Language.php',
                'PasswordResetForm' => 'includes/SpecialResetpass.php',
+               'PatrolLog' => 'includes/PatrolLog.php',
 
                // API classes
                'ApiBase' => 'includes/api/ApiBase.php',
@@ -274,6 +276,7 @@ function __autoload($className) {
                'ApiResult' => 'includes/api/ApiResult.php',
        );
        
+       wfProfileIn( __METHOD__ );
        if ( isset( $localClasses[$className] ) ) {
                $filename = $localClasses[$className];
        } elseif ( isset( $wgAutoloadClasses[$className] ) ) {
@@ -290,6 +293,7 @@ function __autoload($className) {
                }
                if ( !$filename ) {
                        # Give up
+                       wfProfileOut( __METHOD__ );
                        return;
                }
        }
@@ -300,6 +304,7 @@ function __autoload($className) {
                $filename = "$IP/$filename";
        }
        require( $filename );
+       wfProfileOut( __METHOD__ );
 }
 
 function wfLoadAllExtensions() {
@@ -311,10 +316,10 @@ function wfLoadAllExtensions() {
        # guaranteed by entering special pages via SpecialPage members such as 
        # executePath(), but here we have to take a more explicit measure.
        
-       require_once( 'SpecialPage.php' );
+       require_once( dirname(__FILE__) . '/SpecialPage.php' );
        
        foreach( $wgAutoloadClasses as $class => $file ) {
-               if ( ! class_exists( $class ) ) {
+               if( !( class_exists( $class ) || interface_exists( $class ) ) ) {
                        require( $file );
                }
        }