Merge "EditPage::newSectionSummary should return a value in all code paths"

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

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 083a596..0399bd3 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -36,7 +36,6 @@ $wgAutoloadLocalClasses = array(
        'AuthPlugin' => 'includes/AuthPlugin.php',
        'AuthPluginUser' => 'includes/AuthPlugin.php',
        'Autopromote' => 'includes/Autopromote.php',
-       'BaseTemplate' => 'includes/SkinTemplate.php',
        'Block' => 'includes/Block.php',
        'Category' => 'includes/Category.php',
        'Categoryfinder' => 'includes/Categoryfinder.php',
@@ -120,7 +119,6 @@ $wgAutoloadLocalClasses = array(
        'MagicWordArray' => 'includes/MagicWord.php',
        'MailAddress' => 'includes/UserMailer.php',
        'MediaWiki' => 'includes/MediaWiki.php',
-       'MediaWikiI18N' => 'includes/SkinTemplate.php',
        'MediaWikiVersionFetcher' => 'includes/MediaWikiVersionFetcher.php',
        'Message' => 'includes/Message.php',
        'MessageBlobStore' => 'includes/MessageBlobStore.php',
@@ -137,13 +135,12 @@ $wgAutoloadLocalClasses = array(
        'PoolCounter_Stub' => 'includes/poolcounter/PoolCounter.php',
        'PoolCounterRedis' => 'includes/poolcounter/PoolCounterRedis.php',
        'PoolCounterWork' => 'includes/poolcounter/PoolCounterWork.php',
-       'PoolCounterWorkViaCallback' => 'includes/poolcounter/PoolCounterWork.php',
+       'PoolCounterWorkViaCallback' => 'includes/poolcounter/PoolCounterWorkViaCallback.php',
        'PoolWorkArticleView' => 'includes/poolcounter/PoolWorkArticleView.php',
        'Preferences' => 'includes/Preferences.php',
        'PreferencesForm' => 'includes/Preferences.php',
        'PrefixSearch' => 'includes/PrefixSearch.php',
        'ProtectionForm' => 'includes/ProtectionForm.php',
-       'QuickTemplate' => 'includes/SkinTemplate.php',
        'RawMessage' => 'includes/Message.php',
        'ReverseChronologicalPager' => 'includes/Pager.php',
        'RevisionItem' => 'includes/RevisionList.php',
@@ -156,10 +153,6 @@ $wgAutoloadLocalClasses = array(
        'SiteConfiguration' => 'includes/SiteConfiguration.php',
        'SiteStats' => 'includes/SiteStats.php',
        'SiteStatsInit' => 'includes/SiteStats.php',
-       'Skin' => 'includes/Skin.php',
-       'SkinTemplate' => 'includes/SkinTemplate.php',
-       'SkinFallback' => 'includes/SkinFallback.php',
-       'SkinFallbackTemplate' => 'includes/SkinFallback.php',
        'SquidPurgeClient' => 'includes/SquidPurgeClient.php',
        'SquidPurgeClientPool' => 'includes/SquidPurgeClient.php',
        'StatCounter' => 'includes/StatCounter.php',
@@ -215,9 +208,9 @@ $wgAutoloadLocalClasses = array(
        'RevertAction' => 'includes/actions/RevertAction.php',
        'RevisiondeleteAction' => 'includes/actions/RevisiondeleteAction.php',
        'RollbackAction' => 'includes/actions/RollbackAction.php',
-       'SubmitAction' => 'includes/actions/EditAction.php',
-       'UnprotectAction' => 'includes/actions/ProtectAction.php',
-       'UnwatchAction' => 'includes/actions/WatchAction.php',
+       'SubmitAction' => 'includes/actions/SubmitAction.php',
+       'UnprotectAction' => 'includes/actions/UnprotectAction.php',
+       'UnwatchAction' => 'includes/actions/UnwatchAction.php',
        'ViewAction' => 'includes/actions/ViewAction.php',
        'WatchAction' => 'includes/actions/WatchAction.php',
 
@@ -387,6 +380,8 @@ $wgAutoloadLocalClasses = array(
        'CssContent' => 'includes/content/CssContent.php',
        'JavaScriptContentHandler' => 'includes/content/JavaScriptContentHandler.php',
        'JavaScriptContent' => 'includes/content/JavaScriptContent.php',
+       'JSONContentHandler' => 'includes/content/JSONContentHandler.php',
+       'JSONContent' => 'includes/content/JSONContent.php',
        'MessageContent' => 'includes/content/MessageContent.php',
        'MWContentSerializationException' => 'includes/content/ContentHandler.php',
        'TextContentHandler' => 'includes/content/TextContentHandler.php',
@@ -890,25 +885,23 @@ $wgAutoloadLocalClasses = array(
        'ResourceLoaderWikiModule' => 'includes/resourceloader/ResourceLoaderWikiModule.php',
 
        # includes/revisiondelete
-       'RevDelArchivedFileItem' => 'includes/revisiondelete/RevisionDelete.php',
-       'RevDelArchivedFileList' => 'includes/revisiondelete/RevisionDelete.php',
-       'RevDelArchivedRevisionItem' => 'includes/revisiondelete/RevisionDelete.php',
-       'RevDelArchiveItem' => 'includes/revisiondelete/RevisionDelete.php',
-       'RevDelArchiveList' => 'includes/revisiondelete/RevisionDelete.php',
-       'RevDelFileItem' => 'includes/revisiondelete/RevisionDelete.php',
-       'RevDelFileList' => 'includes/revisiondelete/RevisionDelete.php',
+       'RevDelArchivedFileItem' => 'includes/revisiondelete/RevDelArchivedFileItem.php',
+       'RevDelArchivedFileList' => 'includes/revisiondelete/RevDelArchivedFileList.php',
+       'RevDelArchivedRevisionItem' => 'includes/revisiondelete/RevDelArchivedRevisionItem.php',
+       'RevDelArchiveItem' => 'includes/revisiondelete/RevDelArchiveItem.php',
+       'RevDelArchiveList' => 'includes/revisiondelete/RevDelArchiveList.php',
+       'RevDelFileItem' => 'includes/revisiondelete/RevDelFileItem.php',
+       'RevDelFileList' => 'includes/revisiondelete/RevDelFileList.php',
        'RevDelItem' => 'includes/revisiondelete/RevisionDeleteAbstracts.php',
        'RevDelList' => 'includes/revisiondelete/RevisionDeleteAbstracts.php',
-       'RevDelLogItem' => 'includes/revisiondelete/RevisionDelete.php',
-       'RevDelLogList' => 'includes/revisiondelete/RevisionDelete.php',
-       'RevDelRevisionItem' => 'includes/revisiondelete/RevisionDelete.php',
-       'RevDelRevisionList' => 'includes/revisiondelete/RevisionDelete.php',
+       'RevDelLogItem' => 'includes/revisiondelete/RevDelLogItem.php',
+       'RevDelLogList' => 'includes/revisiondelete/RevDelLogList.php',
+       'RevDelRevisionItem' => 'includes/revisiondelete/RevDelRevisionItem.php',
+       'RevDelRevisionList' => 'includes/revisiondelete/RevDelRevisionList.php',
        'RevisionDeleter' => 'includes/revisiondelete/RevisionDeleter.php',
        'RevisionDeleteUser' => 'includes/revisiondelete/RevisionDeleteUser.php',
 
        # includes/search
-       'PostgresSearchResult' => 'includes/search/SearchPostgres.php',
-       'PostgresSearchResultSet' => 'includes/search/SearchPostgres.php',
        'SearchDatabase' => 'includes/search/SearchDatabase.php',
        'SearchEngine' => 'includes/search/SearchEngine.php',
        'SearchEngineDummy' => 'includes/search/SearchEngine.php',
@@ -933,6 +926,17 @@ $wgAutoloadLocalClasses = array(
        'Sites' => 'includes/site/SiteSQLStore.php',
        'SiteStore' => 'includes/site/SiteStore.php',
 
+       # includes/skins
+       'BaseTemplate' => 'includes/skins/SkinTemplate.php',
+       'MediaWikiI18N' => 'includes/skins/SkinTemplate.php',
+       'QuickTemplate' => 'includes/skins/SkinTemplate.php',
+       'Skin' => 'includes/skins/Skin.php',
+       'SkinException' => 'includes/skins/SkinException.php',
+       'SkinFactory' => 'includes/skins/SkinFactory.php',
+       'SkinFallback' => 'includes/skins/SkinFallback.php',
+       'SkinFallbackTemplate' => 'includes/skins/SkinFallbackTemplate.php',
+       'SkinTemplate' => 'includes/skins/SkinTemplate.php',
+
        # includes/specialpage
        'ChangesListSpecialPage' => 'includes/specialpage/ChangesListSpecialPage.php',
        'FormSpecialPage' => 'includes/specialpage/FormSpecialPage.php',