X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FAutoLoader.php;h=85e7e6685b8b3ce2671282bc9457fa6cff3764b6;hb=ae98c49213a8ecfe36a5cc900bec8b1ab9f48f4c;hp=19d349ef2317a26785a37dccdac30e5ba85712da;hpb=2f4c8be5dbf4b43a4d39114fd86ac1570ac9f5c1;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index 19d349ef23..85e7e6685b 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -8,7 +8,7 @@ ini_set('unserialize_callback_func', '__autoload' ); # Extension classes are specified with $wgAutoloadClasses # This array is a global instead of a static member of AutoLoader to work around a bug in APC global $wgAutoloadLocalClasses; -$wgAutoloadLocalClasses = array( +$wgAutoloadLocalClasses = array( # Includes 'AjaxDispatcher' => 'includes/AjaxDispatcher.php', 'AjaxResponse' => 'includes/AjaxResponse.php', @@ -17,7 +17,9 @@ $wgAutoloadLocalClasses = array( 'Article' => 'includes/Article.php', 'AtomFeed' => 'includes/Feed.php', 'AuthPlugin' => 'includes/AuthPlugin.php', + 'AuthPluginUser' => 'includes/AuthPlugin.php', 'Autopromote' => 'includes/Autopromote.php', + 'BacklinkCache' => 'includes/BacklinkCache.php', 'BagOStuff' => 'includes/BagOStuff.php', 'Block' => 'includes/Block.php', 'CacheDependency' => 'includes/CacheDependency.php', @@ -27,6 +29,7 @@ $wgAutoloadLocalClasses = array( 'CategoryViewer' => 'includes/CategoryPage.php', 'ChangesList' => 'includes/ChangesList.php', 'ChangesFeed' => 'includes/ChangesFeed.php', + 'ChangeTags' => 'includes/ChangeTags.php', 'ChannelFeed' => 'includes/Feed.php', 'ConcatenatedGzipHistoryBlob' => 'includes/HistoryBlob.php', 'ConstantDependency' => 'includes/CacheDependency.php', @@ -34,6 +37,7 @@ $wgAutoloadLocalClasses = array( 'Credits' => 'includes/Credits.php', 'DBABagOStuff' => 'includes/BagOStuff.php', 'DependencyWrapper' => 'includes/CacheDependency.php', + 'DiffHistoryBlob' => 'includes/HistoryBlob.php', 'DjVuImage' => 'includes/DjVuImage.php', 'DoubleReplacer' => 'includes/StringUtils.php', 'DoubleRedirectJob' => 'includes/DoubleRedirectJob.php', @@ -71,6 +75,7 @@ $wgAutoloadLocalClasses = array( 'FileDependency' => 'includes/CacheDependency.php', 'FileRevertForm' => 'includes/FileRevertForm.php', 'FileStore' => 'includes/FileStore.php', + 'ForkController' => 'includes/ForkController.php', 'FormatExif' => 'includes/Exif.php', 'FormOptions' => 'includes/FormOptions.php', 'FSException' => 'includes/FileStore.php', @@ -85,12 +90,14 @@ $wgAutoloadLocalClasses = array( 'HTMLCacheUpdateJob' => 'includes/HTMLCacheUpdate.php', 'HTMLFileCache' => 'includes/HTMLFileCache.php', 'Http' => 'includes/HttpFunctions.php', + 'IEContentAnalyzer' => 'includes/IEContentAnalyzer.php', 'ImageGallery' => 'includes/ImageGallery.php', 'ImageHistoryList' => 'includes/ImagePage.php', 'ImagePage' => 'includes/ImagePage.php', 'ImageQueryPage' => 'includes/ImageQueryPage.php', 'IncludableSpecialPage' => 'includes/SpecialPage.php', 'IndexPager' => 'includes/Pager.php', + 'Interwiki' => 'includes/Interwiki.php', 'IP' => 'includes/IP.php', 'Job' => 'includes/JobQueue.php', 'License' => 'includes/Licenses.php', @@ -182,6 +189,7 @@ $wgAutoloadLocalClasses = array( 'StringUtils' => 'includes/StringUtils.php', 'TablePager' => 'includes/Pager.php', 'ThumbnailImage' => 'includes/MediaTransformOutput.php', + 'TiffHandler' => 'includes/media/Tiff.php', 'TitleDependency' => 'includes/CacheDependency.php', 'Title' => 'includes/Title.php', 'TitleArray' => 'includes/TitleArray.php', @@ -189,10 +197,6 @@ $wgAutoloadLocalClasses = array( 'TransformParameterError' => 'includes/MediaTransformOutput.php', 'TurckBagOStuff' => 'includes/BagOStuff.php', 'UnlistedSpecialPage' => 'includes/SpecialPage.php', - 'UploadBase' => 'includes/UploadBase.php', - 'UploadFromStash' => 'includes/UploadFromStash.php', - 'UploadFromUpload' => 'includes/UploadFromUpload.php', - 'UploadFromUrl' => 'includes/UploadFromUrl.php', 'User' => 'includes/User.php', 'UserArray' => 'includes/UserArray.php', 'UserArrayFromResult' => 'includes/UserArray.php', @@ -217,6 +221,7 @@ $wgAutoloadLocalClasses = array( 'ApiBase' => 'includes/api/ApiBase.php', 'ApiBlock' => 'includes/api/ApiBlock.php', 'ApiDelete' => 'includes/api/ApiDelete.php', + 'ApiDisabled' => 'includes/api/ApiDisabled.php', 'ApiEditPage' => 'includes/api/ApiEditPage.php', 'ApiEmailUser' => 'includes/api/ApiEmailUser.php', 'ApiExpandTemplates' => 'includes/api/ApiExpandTemplates.php', @@ -226,11 +231,14 @@ $wgAutoloadLocalClasses = array( 'ApiFormatFeedWrapper' => 'includes/api/ApiFormatBase.php', 'ApiFormatJson' => 'includes/api/ApiFormatJson.php', 'ApiFormatPhp' => 'includes/api/ApiFormatPhp.php', + 'ApiFormatRaw' => 'includes/api/ApiFormatRaw.php', 'ApiFormatTxt' => 'includes/api/ApiFormatTxt.php', 'ApiFormatWddx' => 'includes/api/ApiFormatWddx.php', 'ApiFormatXml' => 'includes/api/ApiFormatXml.php', 'ApiFormatYaml' => 'includes/api/ApiFormatYaml.php', 'ApiHelp' => 'includes/api/ApiHelp.php', + 'ApiImport' => 'includes/api/ApiImport.php', + 'ApiImportReporter' => 'includes/api/ApiImport.php', 'ApiLogin' => 'includes/api/ApiLogin.php', 'ApiLogout' => 'includes/api/ApiLogout.php', 'ApiMain' => 'includes/api/ApiMain.php', @@ -257,6 +265,8 @@ $wgAutoloadLocalClasses = array( 'ApiQueryCategoryMembers' => 'includes/api/ApiQueryCategoryMembers.php', 'ApiQueryContributions' => 'includes/api/ApiQueryUserContributions.php', 'ApiQueryDeletedrevs' => 'includes/api/ApiQueryDeletedrevs.php', + 'ApiQueryDisabled' => 'includes/api/ApiQueryDisabled.php', + 'ApiQueryDuplicateFiles' => 'includes/api/ApiQueryDuplicateFiles.php', 'ApiQueryExtLinksUsage' => 'includes/api/ApiQueryExtLinksUsage.php', 'ApiQueryExternalLinks' => 'includes/api/ApiQueryExternalLinks.php', 'ApiQueryGeneratorBase' => 'includes/api/ApiQueryBase.php', @@ -266,6 +276,7 @@ $wgAutoloadLocalClasses = array( 'ApiQueryLangLinks' => 'includes/api/ApiQueryLangLinks.php', 'ApiQueryLinks' => 'includes/api/ApiQueryLinks.php', 'ApiQueryLogEvents' => 'includes/api/ApiQueryLogEvents.php', + 'ApiQueryProtectedTitles' => 'includes/api/ApiQueryProtectedTitles.php', 'ApiQueryRandom' => 'includes/api/ApiQueryRandom.php', 'ApiQueryRecentChanges'=> 'includes/api/ApiQueryRecentChanges.php', 'ApiQueryRevisions' => 'includes/api/ApiQueryRevisions.php', @@ -274,6 +285,7 @@ $wgAutoloadLocalClasses = array( 'ApiQueryUserInfo' => 'includes/api/ApiQueryUserInfo.php', 'ApiQueryUsers' => 'includes/api/ApiQueryUsers.php', 'ApiQueryWatchlist' => 'includes/api/ApiQueryWatchlist.php', + 'ApiQueryWatchlistRaw' => 'includes/api/ApiQueryWatchlistRaw.php', 'ApiResult' => 'includes/api/ApiResult.php', 'ApiRollback' => 'includes/api/ApiRollback.php', 'ApiUnblock' => 'includes/api/ApiUnblock.php', @@ -283,7 +295,6 @@ $wgAutoloadLocalClasses = array( 'Services_JSON_Error' => 'includes/api/ApiFormatJson_json.php', 'Spyc' => 'includes/api/ApiFormatYaml_spyc.php', 'UsageException' => 'includes/api/ApiMain.php', - 'YAMLNode' => 'includes/api/ApiFormatYaml_spyc.php', # includes/db 'Blob' => 'includes/db/Database.php', @@ -313,10 +324,14 @@ $wgAutoloadLocalClasses = array( 'PostgresField' => 'includes/db/DatabasePostgres.php', 'ResultWrapper' => 'includes/db/Database.php', 'SQLiteField' => 'includes/db/DatabaseSqlite.php', + + 'DatabaseIbm_db2' => 'includes/db/DatabaseIbm_db2.php', + 'IBM_DB2Field' => 'includes/db/DatabaseIbm_db2.php', + 'IBM_DB2SearchResultSet' => 'includes/SearchIBM_DB2.php', + 'SearchIBM_DB2' => 'includes/SearchIBM_DB2.php', # includes/diff 'AncestorComparator' => 'includes/diff/HTMLDiff.php', - 'AncestorComparatorResult' => 'includes/diff/HTMLDiff.php', 'AnchorToString' => 'includes/diff/HTMLDiff.php', 'ArrayDiffFormatter' => 'includes/diff/DifferenceEngine.php', 'BodyNode' => 'includes/diff/Nodes.php', @@ -334,7 +349,6 @@ $wgAutoloadLocalClasses = array( '_DiffOp' => 'includes/diff/DifferenceEngine.php', 'DomTreeBuilder' => 'includes/diff/HTMLDiff.php', 'DummyNode' => 'includes/diff/Nodes.php', - 'EchoingContentHandler' => 'includes/diff/HTMLDiff.php', 'HTMLDiffer' => 'includes/diff/HTMLDiff.php', 'HTMLOutput' => 'includes/diff/HTMLDiff.php', '_HWLDF_WordAccumulator' => 'includes/diff/DifferenceEngine.php', @@ -356,10 +370,11 @@ $wgAutoloadLocalClasses = array( 'WhiteSpaceNode' => 'includes/diff/Nodes.php', 'WikiDiff3' => 'includes/diff/Diff.php', 'WordLevelDiff' => 'includes/diff/DifferenceEngine.php', - + # includes/filerepo 'ArchivedFile' => 'includes/filerepo/ArchivedFile.php', 'File' => 'includes/filerepo/File.php', + 'FileCache' => 'includes/filerepo/FileCache.php', 'FileRepo' => 'includes/filerepo/FileRepo.php', 'FileRepoStatus' => 'includes/filerepo/FileRepoStatus.php', 'ForeignAPIFile' => 'includes/filerepo/ForeignAPIFile.php', @@ -380,6 +395,7 @@ $wgAutoloadLocalClasses = array( # includes/media 'BitmapHandler' => 'includes/media/Bitmap.php', + 'BitmapHandler_ClientOnly' => 'includes/media/Bitmap_ClientOnly.php', 'BmpHandler' => 'includes/media/BMP.php', 'DjVuHandler' => 'includes/media/DjVu.php', 'ImageHandler' => 'includes/media/Generic.php', @@ -420,11 +436,11 @@ $wgAutoloadLocalClasses = array( 'ParserOutput' => 'includes/parser/ParserOutput.php', 'Parser_DiffTest' => 'includes/parser/Parser_DiffTest.php', 'Parser_LinkHooks' => 'includes/parser/Parser_LinkHooks.php', - 'Parser_OldPP' => 'includes/parser/Parser_OldPP.php', 'Preprocessor' => 'includes/parser/Preprocessor.php', 'Preprocessor_DOM' => 'includes/parser/Preprocessor_DOM.php', 'Preprocessor_Hash' => 'includes/parser/Preprocessor_Hash.php', 'StripState' => 'includes/parser/Parser.php', + 'MWTidy' => 'includes/parser/Tidy.php', # includes/specials 'AncientPagesPage' => 'includes/specials/SpecialAncientpages.php', @@ -433,6 +449,8 @@ $wgAutoloadLocalClasses = array( 'DBLockForm' => 'includes/specials/SpecialLockdb.php', 'DBUnlockForm' => 'includes/specials/SpecialUnlockdb.php', 'DeadendPagesPage' => 'includes/specials/SpecialDeadendpages.php', + 'DeletedContributionsPage' => 'includes/specials/SpecialDeletedContributions.php', + 'DeletedContribsPager' => 'includes/specials/SpecialDeletedContributions.php', 'DisambiguationsPage' => 'includes/specials/SpecialDisambiguations.php', 'DoubleRedirectsPage' => 'includes/specials/SpecialDoubleRedirects.php', 'EmailConfirmation' => 'includes/specials/SpecialConfirmemail.php', @@ -444,8 +462,9 @@ $wgAutoloadLocalClasses = array( 'IPBlocklistPager' => 'includes/specials/SpecialIpblocklist.php', 'IPUnblockForm' => 'includes/specials/SpecialIpblocklist.php', 'ImportReporter' => 'includes/specials/SpecialImport.php', - 'ImportStreamSource' => 'includes/specials/SpecialImport.php', - 'ImportStringSource' => 'includes/specials/SpecialImport.php', + 'ImportStreamSource' => 'includes/Import.php', + 'ImportStringSource' => 'includes/Import.php', + 'LinkSearchPage' => 'includes/specials/SpecialLinkSearch.php', 'ListredirectsPage' => 'includes/specials/SpecialListredirects.php', 'LoginForm' => 'includes/specials/SpecialUserlogin.php', 'LonelyPagesPage' => 'includes/specials/SpecialLonelypages.php', @@ -458,17 +477,20 @@ $wgAutoloadLocalClasses = array( 'MostrevisionsPage' => 'includes/specials/SpecialMostrevisions.php', 'MovePageForm' => 'includes/specials/SpecialMovepage.php', 'SpecialNewpages' => 'includes/specials/SpecialNewpages.php', + 'SpecialContributions' => 'includes/specials/SpecialContributions.php', 'NewPagesPager' => 'includes/specials/SpecialNewpages.php', 'PageArchive' => 'includes/specials/SpecialUndelete.php', - 'PasswordResetForm' => 'includes/specials/SpecialResetpass.php', + 'SpecialResetpass' => 'includes/specials/SpecialResetpass.php', 'PopularPagesPage' => 'includes/specials/SpecialPopularpages.php', 'PreferencesForm' => 'includes/specials/SpecialPreferences.php', 'RandomPage' => 'includes/specials/SpecialRandompage.php', - 'RevisionDeleteForm' => 'includes/specials/SpecialRevisiondelete.php', + 'SpecialRevisionDelete' => 'includes/specials/SpecialRevisiondelete.php', 'RevisionDeleter' => 'includes/specials/SpecialRevisiondelete.php', 'ShortPagesPage' => 'includes/specials/SpecialShortpages.php', 'SpecialAllpages' => 'includes/specials/SpecialAllpages.php', 'SpecialBookSources' => 'includes/specials/SpecialBooksources.php', + 'SpecialExport' => 'includes/specials/SpecialExport.php', + 'SpecialImport' => 'includes/specials/SpecialImport.php', 'SpecialListGroupRights' => 'includes/specials/SpecialListgrouprights.php', 'SpecialMostlinkedtemplates' => 'includes/specials/SpecialMostlinkedtemplates.php', 'SpecialPrefixindex' => 'includes/specials/SpecialPrefixindex.php', @@ -476,6 +498,9 @@ $wgAutoloadLocalClasses = array( 'SpecialRecentchanges' => 'includes/specials/SpecialRecentchanges.php', 'SpecialRecentchangeslinked' => 'includes/specials/SpecialRecentchangeslinked.php', 'SpecialSearch' => 'includes/specials/SpecialSearch.php', + 'SpecialSearchOld' => 'includes/specials/SpecialSearch.php', + 'SpecialStatistics' => 'includes/specials/SpecialStatistics.php', + 'SpecialTags' => 'includes/specials/SpecialTags.php', 'SpecialVersion' => 'includes/specials/SpecialVersion.php', 'UncategorizedCategoriesPage' => 'includes/specials/SpecialUncategorizedcategories.php', 'UncategorizedPagesPage' => 'includes/specials/SpecialUncategorizedpages.php', @@ -492,9 +517,10 @@ $wgAutoloadLocalClasses = array( 'WantedCategoriesPage' => 'includes/specials/SpecialWantedcategories.php', 'WantedFilesPage' => 'includes/specials/SpecialWantedfiles.php', 'WantedPagesPage' => 'includes/specials/SpecialWantedpages.php', + 'WantedTemplatesPage' => 'includes/specials/SpecialWantedtemplates.php', 'WhatLinksHerePage' => 'includes/specials/SpecialWhatlinkshere.php', - 'WikiImporter' => 'includes/specials/SpecialImport.php', - 'WikiRevision' => 'includes/specials/SpecialImport.php', + 'WikiImporter' => 'includes/Import.php', + 'WikiRevision' => 'includes/Import.php', 'WithoutInterwikiPage' => 'includes/specials/SpecialWithoutinterwiki.php', # includes/templates @@ -517,16 +543,15 @@ $wgAutoloadLocalClasses = array( class AutoLoader { /** * autoload - take a class name and attempt to load it - * + * * @param string $className Name of class we're looking for. * @return bool Returning false is important on failure as * it allows Zend to try and look in other registered autoloaders - * as well. + * as well. */ static function autoload( $className ) { global $wgAutoloadClasses, $wgAutoloadLocalClasses; - wfProfileIn( __METHOD__ ); if ( isset( $wgAutoloadLocalClasses[$className] ) ) { $filename = $wgAutoloadLocalClasses[$className]; } elseif ( isset( $wgAutoloadClasses[$className] ) ) { @@ -542,8 +567,9 @@ class AutoLoader { } } if ( !$filename ) { + if( function_exists( 'wfDebug' ) ) + wfDebug( "Class {$className} not found; skipped loading\n" ); # Give up - wfProfileOut( __METHOD__ ); return false; } } @@ -554,7 +580,6 @@ class AutoLoader { $filename = "$IP/$filename"; } require( $filename ); - wfProfileOut( __METHOD__ ); return true; } @@ -562,7 +587,7 @@ class AutoLoader { global $wgAutoloadClasses; foreach( $wgAutoloadClasses as $class => $file ) { - if( !( class_exists( $class ) || interface_exists( $class ) ) ) { + if( !( class_exists( $class, false ) || interface_exists( $class, false ) ) ) { require( $file ); } } @@ -580,4 +605,3 @@ if ( function_exists( 'spl_autoload_register' ) ) { AutoLoader::autoload( $class ); } } -