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 58c8461..1f81249 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -185,6 +185,7 @@ $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',
@@ -461,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',
@@ -547,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',
@@ -686,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',
 
@@ -987,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',
@@ -1073,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',