Merge "Stop using the unholy trinity in DatabaseError"

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

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 6ee62e0..1f81249 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -50,6 +50,7 @@ $wgAutoloadLocalClasses = array(
        'ChangeTags' => 'includes/ChangeTags.php',
        'ChannelFeed' => 'includes/Feed.php',
        'Collation' => 'includes/Collation.php',
+       'CollationCkb' => 'includes/Collation.php',
        'ConcatenatedGzipHistoryBlob' => 'includes/HistoryBlob.php',
        'Cookie' => 'includes/Cookie.php',
        'CookieJar' => 'includes/Cookie.php',
@@ -84,7 +85,7 @@ $wgAutoloadLocalClasses = array(
        'FormlessAction' => 'includes/Action.php',
        'FormAction' => 'includes/Action.php',
        'FormOptions' => 'includes/FormOptions.php',
-       'FormSpecialPage' => 'includes/SpecialPage.php',
+       'FormSpecialPage' => 'includes/specialpage/FormSpecialPage.php',
        'GitInfo' => 'includes/GitInfo.php',
        'HistoryBlob' => 'includes/HistoryBlob.php',
        'HistoryBlobCurStub' => 'includes/HistoryBlob.php',
@@ -92,27 +93,27 @@ $wgAutoloadLocalClasses = array(
        'Hooks' => 'includes/Hooks.php',
        'Html' => 'includes/Html.php',
        'HtmlFormatter' => 'includes/HtmlFormatter.php',
-       'HTMLApiField' => 'includes/HTMLForm.php',
-       'HTMLButtonField' => 'includes/HTMLForm.php',
-       'HTMLCheckField' => 'includes/HTMLForm.php',
-       'HTMLCheckMatrix' => 'includes/HTMLForm.php',
-       'HTMLEditTools' => 'includes/HTMLForm.php',
-       'HTMLFloatField' => 'includes/HTMLForm.php',
-       'HTMLForm' => 'includes/HTMLForm.php',
-       'HTMLFormField' => 'includes/HTMLForm.php',
-       'HTMLFormFieldRequiredOptionsException' => 'includes/HTMLForm.php',
-       'HTMLHiddenField' => 'includes/HTMLForm.php',
-       'HTMLInfoField' => 'includes/HTMLForm.php',
-       'HTMLIntField' => 'includes/HTMLForm.php',
-       'HTMLNestedFilterable' => 'includes/HTMLForm.php',
-       'HTMLMultiSelectField' => 'includes/HTMLForm.php',
-       'HTMLRadioField' => 'includes/HTMLForm.php',
-       'HTMLSelectAndOtherField' => 'includes/HTMLForm.php',
-       'HTMLSelectField' => 'includes/HTMLForm.php',
-       'HTMLSelectOrOtherField' => 'includes/HTMLForm.php',
-       'HTMLSubmitField' => 'includes/HTMLForm.php',
-       'HTMLTextAreaField' => 'includes/HTMLForm.php',
-       'HTMLTextField' => 'includes/HTMLForm.php',
+       'HTMLApiField' => 'includes/htmlform/HTMLApiField.php',
+       'HTMLButtonField' => 'includes/htmlform/HTMLButtonField.php',
+       'HTMLCheckField' => 'includes/htmlform/HTMLCheckField.php',
+       'HTMLCheckMatrix' => 'includes/htmlform/HTMLCheckMatrix.php',
+       'HTMLEditTools' => 'includes/htmlform/HTMLEditTools.php',
+       'HTMLFloatField' => 'includes/htmlform/HTMLFloatField.php',
+       'HTMLForm' => 'includes/htmlform/HTMLForm.php',
+       'HTMLFormField' => 'includes/htmlform/HTMLFormField.php',
+       'HTMLFormFieldRequiredOptionsException' => 'includes/htmlform/HTMLFormFieldRequiredOptionsException.php',
+       'HTMLHiddenField' => 'includes/htmlform/HTMLHiddenField.php',
+       'HTMLInfoField' => 'includes/htmlform/HTMLInfoField.php',
+       'HTMLIntField' => 'includes/htmlform/HTMLIntField.php',
+       'HTMLNestedFilterable' => 'includes/htmlform/HTMLNestedFilterable.php',
+       'HTMLMultiSelectField' => 'includes/htmlform/HTMLMultiSelectField.php',
+       'HTMLRadioField' => 'includes/htmlform/HTMLRadioField.php',
+       'HTMLSelectAndOtherField' => 'includes/htmlform/HTMLSelectAndOtherField.php',
+       'HTMLSelectField' => 'includes/htmlform/HTMLSelectField.php',
+       'HTMLSelectOrOtherField' => 'includes/htmlform/HTMLSelectOrOtherField.php',
+       'HTMLSubmitField' => 'includes/htmlform/HTMLSubmitField.php',
+       'HTMLTextAreaField' => 'includes/htmlform/HTMLTextAreaField.php',
+       'HTMLTextField' => 'includes/htmlform/HTMLTextField.php',
        'Http' => 'includes/HttpFunctions.php',
        'HttpError' => 'includes/Exception.php',
        'ICacheHelper' => 'includes/CacheHelper.php',
@@ -124,7 +125,7 @@ $wgAutoloadLocalClasses = array(
        'ImageQueryPage' => 'includes/ImageQueryPage.php',
        'ImportStreamSource' => 'includes/Import.php',
        'ImportStringSource' => 'includes/Import.php',
-       'IncludableSpecialPage' => 'includes/SpecialPage.php',
+       'IncludableSpecialPage' => 'includes/specialpage/IncludableSpecialPage.php',
        'IndexPager' => 'includes/Pager.php',
        'Interwiki' => 'includes/interwiki/Interwiki.php',
        'LCStore' => 'includes/cache/LocalisationCache.php',
@@ -175,8 +176,8 @@ $wgAutoloadLocalClasses = array(
        'RawMessage' => 'includes/Message.php',
        'RdfMetaData' => 'includes/Metadata.php',
        'ReadOnlyError' => 'includes/Exception.php',
-       'RedirectSpecialArticle' => 'includes/SpecialPage.php',
-       'RedirectSpecialPage' => 'includes/SpecialPage.php',
+       'RedirectSpecialArticle' => 'includes/specialpage/RedirectSpecialPage.php',
+       'RedirectSpecialPage' => 'includes/specialpage/RedirectSpecialPage.php',
        'ReverseChronologicalPager' => 'includes/Pager.php',
        'RevisionItem' => 'includes/RevisionList.php',
        'RevisionItemBase' => 'includes/RevisionList.php',
@@ -184,23 +185,24 @@ $wgAutoloadLocalClasses = array(
        'Revision' => 'includes/Revision.php',
        'RevisionList' => 'includes/RevisionList.php',
        'RSSFeed' => 'includes/Feed.php',
+       'RunningStat' => 'includes/profiler/RunningStat.php',
        'Sanitizer' => 'includes/Sanitizer.php',
        'SiteConfiguration' => 'includes/SiteConfiguration.php',
        'SiteStats' => 'includes/SiteStats.php',
        'SiteStatsInit' => 'includes/SiteStats.php',
        'Skin' => 'includes/Skin.php',
        'SkinTemplate' => 'includes/SkinTemplate.php',
-       'SpecialCreateAccount' => 'includes/SpecialPage.php',
-       'SpecialListAdmins' => 'includes/SpecialPage.php',
-       'SpecialListBots' => 'includes/SpecialPage.php',
-       'SpecialMycontributions' => 'includes/SpecialPage.php',
-       'SpecialMypage' => 'includes/SpecialPage.php',
-       'SpecialMytalk' => 'includes/SpecialPage.php',
-       'SpecialMyuploads' => 'includes/SpecialPage.php',
-       'SpecialAllMyUploads' => 'includes/SpecialPage.php',
-       'SpecialPage' => 'includes/SpecialPage.php',
+       'SpecialCreateAccount' => 'includes/specials/SpecialCreateAccount.php',
+       'SpecialListAdmins' => 'includes/specials/SpecialListusers.php',
+       'SpecialListBots' => 'includes/specials/SpecialListusers.php',
+       'SpecialMycontributions' => 'includes/specials/SpecialMyRedirectPages.php',
+       'SpecialMypage' => 'includes/specials/SpecialMyRedirectPages.php',
+       'SpecialMytalk' => 'includes/specials/SpecialMyRedirectPages.php',
+       'SpecialMyuploads' => 'includes/specials/SpecialMyRedirectPages.php',
+       'SpecialAllMyUploads' => 'includes/specials/SpecialMyRedirectPages.php',
+       'SpecialPage' => 'includes/specialpage/SpecialPage.php',
        'SpecialPageFactory' => 'includes/SpecialPageFactory.php',
-       'SpecialRedirectToSpecial' => 'includes/SpecialPage.php',
+       'SpecialRedirectToSpecial' => 'includes/specialpage/RedirectSpecialPage.php',
        'SquidPurgeClient' => 'includes/SquidPurgeClient.php',
        'SquidPurgeClientPool' => 'includes/SquidPurgeClient.php',
        'StatCounter' => 'includes/StatCounter.php',
@@ -216,7 +218,7 @@ $wgAutoloadLocalClasses = array(
        'TitleArray' => 'includes/TitleArray.php',
        'TitleArrayFromResult' => 'includes/TitleArray.php',
        'ThrottledError' => 'includes/Exception.php',
-       'UnlistedSpecialPage' => 'includes/SpecialPage.php',
+       'UnlistedSpecialPage' => 'includes/specialpage/UnlistedSpecialPage.php',
        'UploadSourceAdapter' => 'includes/Import.php',
        'UppercaseCollation' => 'includes/Collation.php',
        'User' => 'includes/User.php',
@@ -460,16 +462,16 @@ $wgAutoloadLocalClasses = array(
        'FakeResultWrapper' => 'includes/db/DatabaseUtility.php',
        'Field' => 'includes/db/DatabaseUtility.php',
        'LBFactory' => 'includes/db/LBFactory.php',
-       'LBFactory_Fake' => 'includes/db/LBFactory.php',
-       'LBFactory_Multi' => 'includes/db/LBFactory_Multi.php',
-       'LBFactory_Simple' => 'includes/db/LBFactory.php',
-       'LBFactory_Single' => 'includes/db/LBFactory_Single.php',
+       'LBFactoryFake' => 'includes/db/LBFactory.php',
+       'LBFactoryMulti' => 'includes/db/LBFactoryMulti.php',
+       'LBFactorySimple' => 'includes/db/LBFactory.php',
+       'LBFactorySingle' => 'includes/db/LBFactorySingle.php',
        'LikeMatch' => 'includes/db/DatabaseUtility.php',
        'LoadBalancer' => 'includes/db/LoadBalancer.php',
-       'LoadBalancer_Single' => 'includes/db/LBFactory_Single.php',
+       'LoadBalancerSingle' => 'includes/db/LBFactorySingle.php',
        'LoadMonitor' => 'includes/db/LoadMonitor.php',
-       'LoadMonitor_MySQL' => 'includes/db/LoadMonitor.php',
-       'LoadMonitor_Null' => 'includes/db/LoadMonitor.php',
+       'LoadMonitorMySQL' => 'includes/db/LoadMonitor.php',
+       'LoadMonitorNull' => 'includes/db/LoadMonitor.php',
        'MssqlField' => 'includes/db/DatabaseMssql.php',
        'MssqlResult' => 'includes/db/DatabaseMssql.php',
        'MySQLField' => 'includes/db/DatabaseMysqlBase.php',
@@ -533,6 +535,7 @@ $wgAutoloadLocalClasses = array(
        'FileBackendGroup' => 'includes/filebackend/FileBackendGroup.php',
        'FileBackend' => 'includes/filebackend/FileBackend.php',
        'FileBackendError' => 'includes/filebackend/FileBackend.php',
+       'FileBackendException' => 'includes/filebackend/FileBackend.php',
        'FileBackendStore' => 'includes/filebackend/FileBackendStore.php',
        'FileBackendStoreShardListIterator' => 'includes/filebackend/FileBackendStore.php',
        'FileBackendStoreShardDirIterator' => 'includes/filebackend/FileBackendStore.php',
@@ -545,6 +548,7 @@ $wgAutoloadLocalClasses = array(
        'FSFileBackendDirList' => 'includes/filebackend/FSFileBackend.php',
        'FSFileBackendFileList' => 'includes/filebackend/FSFileBackend.php',
        'FSFileOpHandle' => 'includes/filebackend/FSFileBackend.php',
+       'MemoryFileBackend' => 'includes/filebackend/MemoryFileBackend.php',
        'SwiftFileBackend' => 'includes/filebackend/SwiftFileBackend.php',
        'SwiftFileBackendList' => 'includes/filebackend/SwiftFileBackend.php',
        'SwiftFileBackendDirList' => 'includes/filebackend/SwiftFileBackend.php',
@@ -684,6 +688,7 @@ $wgAutoloadLocalClasses = array(
        'JSParser' => 'includes/libs/jsminplus.php',
        'JSToken' => 'includes/libs/jsminplus.php',
        'JSTokenizer' => 'includes/libs/jsminplus.php',
+       'ScopedCallback' => 'includes/libs/ScopedCallback.php',
        'ScopedPHPTimeout' => 'includes/libs/ScopedPHPTimeout.php',
        'XmlTypeCheck' => 'includes/libs/XmlTypeCheck.php',
 
@@ -977,7 +982,7 @@ $wgAutoloadLocalClasses = array(
        'SpecialNewpages' => 'includes/specials/SpecialNewpages.php',
        'SpecialPasswordReset' => 'includes/specials/SpecialPasswordReset.php',
        'SpecialPagesWithProp' => 'includes/specials/SpecialPagesWithProp.php',
-       'SpecialPermanentLink' => 'includes/SpecialPage.php',
+       'SpecialPermanentLink' => 'includes/specials/SpecialPermanentLink.php',
        'SpecialPreferences' => 'includes/specials/SpecialPreferences.php',
        'SpecialPrefixindex' => 'includes/specials/SpecialPrefixindex.php',
        'SpecialProtectedpages' => 'includes/specials/SpecialProtectedpages.php',
@@ -985,7 +990,7 @@ $wgAutoloadLocalClasses = array(
        'SpecialRandomInCategory' => 'includes/specials/SpecialRandomInCategory.php',
        'SpecialRandomredirect' => 'includes/specials/SpecialRandomredirect.php',
        'SpecialRecentChanges' => 'includes/specials/SpecialRecentchanges.php',
-       'SpecialRecentchangeslinked' => 'includes/specials/SpecialRecentchangeslinked.php',
+       'SpecialRecentChangesLinked' => 'includes/specials/SpecialRecentchangeslinked.php',
        'SpecialRedirect' => 'includes/specials/SpecialRedirect.php',
        'SpecialResetTokens' => 'includes/specials/SpecialResetTokens.php',
        'SpecialRevisionDelete' => 'includes/specials/SpecialRevisiondelete.php',
@@ -1071,7 +1076,6 @@ $wgAutoloadLocalClasses = array(
        'RegexlikeReplacer' => 'includes/utils/StringUtils.php',
        'ReplacementArray' => 'includes/utils/StringUtils.php',
        'Replacer' => 'includes/utils/StringUtils.php',
-       'ScopedCallback' => 'includes/utils/ScopedCallback.php',
        'StringUtils' => 'includes/utils/StringUtils.php',
        'UIDGenerator' => 'includes/utils/UIDGenerator.php',
        'ZipDirectoryReader' => 'includes/utils/ZipDirectoryReader.php',