dépôts / lhc / web / wiklou.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix retarded mistake in 57997, move break to within the if block or it defeats the...
[lhc/web/wiklou.git] / includes / AutoLoader.php
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 33b05ea..5e2fce7 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -2,8 +2,6 @@
 
 /* This defines autoloading handler for whole MediaWiki framework */
 
-ini_set('unserialize_callback_func', '__autoload' );
-
 # Locations of core classes
 # 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
@@ -74,6 +72,8 @@ $wgAutoloadLocalClasses = array(
        'ExternalStoreDB' => 'includes/ExternalStoreDB.php',
        'ExternalStoreHttp' => 'includes/ExternalStoreHttp.php',
        'ExternalStore' => 'includes/ExternalStore.php',
+       'ExternalUser' => 'includes/ExternalUser.php',
+       'ExternalUser_vB' => 'includes/extauth/vB.php',
        'FatalError' => 'includes/Exception.php',
        'FakeTitle' => 'includes/FakeTitle.php',
        'FauxRequest' => 'includes/WebRequest.php',
@@ -85,12 +85,17 @@ $wgAutoloadLocalClasses = array(
        'ForkController' => 'includes/ForkController.php',
        'FormatExif' => 'includes/Exif.php',
        'FormOptions' => 'includes/FormOptions.php',
+       'GIFMetadataExtractor' => 'includes/media/GIFMetadataExtractor.php',
+       'GIFHandler' => 'includes/media/GIF.php',
        'GlobalDependency' => 'includes/CacheDependency.php',
        'HashBagOStuff' => 'includes/BagOStuff.php',
        'HashtableReplacer' => 'includes/StringUtils.php',
        'HistoryBlobCurStub' => 'includes/HistoryBlob.php',
        'HistoryBlob' => 'includes/HistoryBlob.php',
        'HistoryBlobStub' => 'includes/HistoryBlob.php',
+       'HistoryPage' => 'includes/HistoryPage.php',
+       'HistoryPager' => 'includes/HistoryPage.php',
+       'Html' => 'includes/Html.php',
        'HTMLCacheUpdate' => 'includes/HTMLCacheUpdate.php',
        'HTMLCacheUpdateJob' => 'includes/HTMLCacheUpdate.php',
        'HTMLFileCache' => 'includes/HTMLFileCache.php',
@@ -149,21 +154,17 @@ $wgAutoloadLocalClasses = array(
        'MimeMagic' => 'includes/MimeMagic.php',
        'MWException' => 'includes/Exception.php',
        'MWNamespace' => 'includes/Namespace.php',
-       'MySQLSearchResultSet' => 'includes/SearchMySQL.php',
        'Namespace' => 'includes/NamespaceCompat.php', // Compat
        'OldChangesList' => 'includes/ChangesList.php',
-       'OracleSearchResultSet' => 'includes/SearchOracle.php',
        'OutputPage' => 'includes/OutputPage.php',
-       'PageHistory' => 'includes/PageHistory.php',
-       'PageHistoryPager' => 'includes/PageHistory.php',
        'PageQueryPage' => 'includes/PageQueryPage.php',
+       'PageHistory' => 'includes/HistoryPage.php',
+       'PageHistoryPager' => 'includes/HistoryPage.php',
        'Pager' => 'includes/Pager.php',
        'PasswordError' => 'includes/User.php',
        'PatrolLog' => 'includes/PatrolLog.php',
        'PoolCounter' => 'includes/PoolCounter.php',
        'PoolCounter_Stub' => 'includes/PoolCounter.php',
-       'PostgresSearchResult' => 'includes/SearchPostgres.php',
-       'PostgresSearchResultSet' => 'includes/SearchPostgres.php',
        'Preferences' => 'includes/Preferences.php',
        'PrefixSearch' => 'includes/PrefixSearch.php',
        'Profiler' => 'includes/Profiler.php',
@@ -186,20 +187,9 @@ $wgAutoloadLocalClasses = array(
        'Revision' => 'includes/Revision.php',
        'RSSFeed' => 'includes/Feed.php',
        'Sanitizer' => 'includes/Sanitizer.php',
-       'SearchEngineDummy' => 'includes/SearchEngine.php',
-       'SearchEngine' => 'includes/SearchEngine.php',
-       'SearchHighlighter' => 'includes/SearchEngine.php',
-       'SearchMySQL4' => 'includes/SearchMySQL4.php',
-       'SearchMySQL' => 'includes/SearchMySQL.php',
-       'SearchOracle' => 'includes/SearchOracle.php',
-       'SearchPostgres' => 'includes/SearchPostgres.php',
-       'SearchResult' => 'includes/SearchEngine.php',
-       'SearchResultSet' => 'includes/SearchEngine.php',
-       'SearchResultTooMany' => 'includes/SearchEngine.php',
-       'SearchUpdate' => 'includes/SearchUpdate.php',
-       'SearchUpdateMyISAM' => 'includes/SearchUpdate.php',
        'SiteConfiguration' => 'includes/SiteConfiguration.php',
        'SiteStats' => 'includes/SiteStats.php',
+       'SiteStatsInit' => 'includes/SiteStats.php',
        'SiteStatsUpdate' => 'includes/SiteStats.php',
        'Skin' => 'includes/Skin.php',
        'SkinTemplate' => 'includes/SkinTemplate.php',
@@ -326,11 +316,15 @@ $wgAutoloadLocalClasses = array(
        'ApiUserrights' => 'includes/api/ApiUserrights.php',
        'ApiUpload' => 'includes/api/ApiUpload.php',
        'ApiWatch' => 'includes/api/ApiWatch.php',
-       'Services_JSON' => 'includes/api/ApiFormatJson_json.php',
-       'Services_JSON_Error' => 'includes/api/ApiFormatJson_json.php',
+
        'Spyc' => 'includes/api/ApiFormatYaml_spyc.php',
        'UsageException' => 'includes/api/ApiMain.php',
 
+       # includes/json
+       'Services_JSON' => 'includes/json/Services_JSON.php',
+       'Services_JSON_Error' => 'includes/json/Services_JSON.php',
+       'FormatJson' => 'includes/json/FormatJson.php',
+
        # includes/db
        'Blob' => 'includes/db/Database.php',
        'ChronologyProtector' => 'includes/db/LBFactory.php',
@@ -349,6 +343,7 @@ $wgAutoloadLocalClasses = array(
        'LBFactory' => 'includes/db/LBFactory.php',
        'LBFactory_Multi' => 'includes/db/LBFactory_Multi.php',
        'LBFactory_Simple' => 'includes/db/LBFactory.php',
+       'LikeMatch' => 'includes/db/Database.php',
        'LoadBalancer' => 'includes/db/LoadBalancer.php',
        'LoadMonitor' => 'includes/db/LoadMonitor.php',
        'LoadMonitor_MySQL' => 'includes/db/LoadMonitor.php',
@@ -360,11 +355,8 @@ $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',
@@ -375,7 +367,7 @@ $wgAutoloadLocalClasses = array(
        'ChangeTextGenerator' => 'includes/diff/HTMLDiff.php',
        'DelegatingContentHandler' => 'includes/diff/HTMLDiff.php',
        '_DiffEngine' => 'includes/diff/DifferenceEngine.php',
-       'DifferenceEngine' => 'includes/diff/DifferenceEngine.php',
+       'DifferenceEngine' => 'includes/diff/DifferenceInterface.php',
        'DiffFormatter' => 'includes/diff/DifferenceEngine.php',
        'Diff' => 'includes/diff/DifferenceEngine.php',
        '_DiffOp_Add' => 'includes/diff/DifferenceEngine.php',
@@ -410,7 +402,6 @@ $wgAutoloadLocalClasses = array(
        # 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',
@@ -478,6 +469,26 @@ $wgAutoloadLocalClasses = array(
        'StripState' => 'includes/parser/Parser.php',
        'MWTidy' => 'includes/parser/Tidy.php',
 
+       # includes/search
+       'IBM_DB2SearchResultSet' => 'includes/search/SearchIBM_DB2.php',
+       'MySQLSearchResultSet' => 'includes/search/SearchMySQL.php',
+       'OracleSearchResultSet' => 'includes/search/SearchOracle.php',
+       'PostgresSearchResult' => 'includes/search/SearchPostgres.php',
+       'PostgresSearchResultSet' => 'includes/search/SearchPostgres.php',
+       'SearchEngineDummy' => 'includes/search/SearchEngine.php',
+       'SearchEngine' => 'includes/search/SearchEngine.php',
+       'SearchHighlighter' => 'includes/search/SearchEngine.php',
+       'SearchIBM_DB2' => 'includes/search/SearchIBM_DB2.php',
+       'SearchMySQL4' => 'includes/search/SearchMySQL4.php',
+       'SearchMySQL' => 'includes/search/SearchMySQL.php',
+       'SearchOracle' => 'includes/search/SearchOracle.php',
+       'SearchPostgres' => 'includes/search/SearchPostgres.php',
+       'SearchResult' => 'includes/search/SearchEngine.php',
+       'SearchResultSet' => 'includes/search/SearchEngine.php',
+       'SearchResultTooMany' => 'includes/search/SearchEngine.php',
+       'SearchUpdate' => 'includes/search/SearchUpdate.php',
+       'SearchUpdateMyISAM' => 'includes/search/SearchUpdate.php',
+
        # includes/specials
        'SpecialAllmessages' => 'includes/specials/SpecialAllmessages.php',
        'AncientPagesPage' => 'includes/specials/SpecialAncientpages.php',
@@ -538,9 +549,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',
+       'SpecialUpload' => 'includes/specials/SpecialUpload.php',
        'SpecialVersion' => 'includes/specials/SpecialVersion.php',
        'SpecialWhatlinkshere' => 'includes/specials/SpecialWhatlinkshere.php',
        'UncategorizedCategoriesPage' => 'includes/specials/SpecialUncategorizedcategories.php',
@@ -578,6 +589,7 @@ $wgAutoloadLocalClasses = array(
        'metawikiStatsOutput' => 'maintenance/language/StatOutputs.php',
        'textStatsOutput' => 'maintenance/language/StatOutputs.php',
        'csvStatsOutput' => 'maintenance/language/StatOutputs.php',
+       'SevenZipStream' => 'maintenance/7zip.inc',
 
 );
 
@@ -593,6 +605,7 @@ $wgJSAutoloadLocalClasses = array(
        'edit' => 'skins/common/edit.js',
        'enhancedchanges.js' => 'skins/common/enhancedchanges.js',
        'history' => 'skins/common/history.js',
+       'htmlform' => 'skins/common/htmlform.js',
        'IEFixes' => 'skins/common/IEFixes.js',
        'metadata' => 'skins/common/metadata.js',
        'mwsuggest' => 'skins/common/mwsuggest.js',
@@ -607,13 +620,10 @@ $wgJSAutoloadLocalClasses = array(
        // phase 2 javascript:
        'uploadPage' => 'js2/uploadPage.js',
        'editPage' => 'js2/editPage.js',
+       'ajaxCategories' => 'js2/ajaxcategories.js',
+       'apiProxyPage'  => 'js2/apiProxyPage.js'
 );
 
-//Include the js2 autoLoadClasses
-//@@todo move jsAutoloadLocalClasses.php to post Setup so we have default values and can check the $wgEnableJS2system var
-$wgMwEmbedDirectory = "js2/mwEmbed/";
-require_once("$IP/js2/mwEmbed/php/jsAutoloadLocalClasses.php");
-
 class AutoLoader {
        /**
         * autoload - take a class name and attempt to load it
@@ -678,4 +688,6 @@ if ( function_exists( 'spl_autoload_register' ) ) {
        function __autoload( $class ) {
                AutoLoader::autoload( $class );
        }
+
+       ini_set( 'unserialize_callback_func', '__autoload' );
 }
Wiklou, le Wiki du Wiklou