X-Git-Url: https://git.cyclocoop.org/%28%28?a=blobdiff_plain;f=includes%2FAutoLoader.php;h=6afd164e6c90deceece7523235ba546467b6d064;hb=e711503e7a1725c87f2b130971488a654f39e210;hp=f79fdc92439c3be8a2cfc6f60c8cef1c3e40cbf6;hpb=45de3c80571242ac9da620da3ddeebfb257ca790;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index f79fdc9243..6afd164e6c 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -128,16 +128,16 @@ $wgAutoloadLocalClasses = array(
 	'IndexPager' => 'includes/Pager.php',
 	'Interwiki' => 'includes/interwiki/Interwiki.php',
 	'LCStore' => 'includes/cache/LocalisationCache.php',
-	'LCStore_Accel' => 'includes/cache/LocalisationCache.php',
-	'LCStore_CDB' => 'includes/cache/LocalisationCache.php',
-	'LCStore_DB' => 'includes/cache/LocalisationCache.php',
-	'LCStore_Null' => 'includes/cache/LocalisationCache.php',
+	'LCStoreAccel' => 'includes/cache/LocalisationCache.php',
+	'LCStoreCDB' => 'includes/cache/LocalisationCache.php',
+	'LCStoreDB' => 'includes/cache/LocalisationCache.php',
+	'LCStoreNull' => 'includes/cache/LocalisationCache.php',
 	'License' => 'includes/Licenses.php',
 	'Licenses' => 'includes/Licenses.php',
 	'Linker' => 'includes/Linker.php',
 	'LinkFilter' => 'includes/LinkFilter.php',
 	'LocalisationCache' => 'includes/cache/LocalisationCache.php',
-	'LocalisationCache_BulkLoad' => 'includes/cache/LocalisationCache.php',
+	'LocalisationCacheBulkLoad' => 'includes/cache/LocalisationCache.php',
 	'MagicWord' => 'includes/MagicWord.php',
 	'MagicWordArray' => 'includes/MagicWord.php',
 	'MailAddress' => 'includes/UserMailer.php',
@@ -505,21 +505,21 @@ $wgAutoloadLocalClasses = array(
 	'ViewCountUpdate' => 'includes/deferred/ViewCountUpdate.php',
 
 	# includes/diff
-	'_DiffEngine' => 'includes/diff/DairikiDiff.php',
-	'_DiffOp' => 'includes/diff/DairikiDiff.php',
-	'_DiffOp_Add' => 'includes/diff/DairikiDiff.php',
-	'_DiffOp_Change' => 'includes/diff/DairikiDiff.php',
-	'_DiffOp_Copy' => 'includes/diff/DairikiDiff.php',
-	'_DiffOp_Delete' => 'includes/diff/DairikiDiff.php',
-	'_HWLDF_WordAccumulator' => 'includes/diff/DairikiDiff.php',
-	'ArrayDiffFormatter' => 'includes/diff/DairikiDiff.php',
+	'DiffEngine' => 'includes/diff/DairikiDiff.php',
+	'DiffOp' => 'includes/diff/DairikiDiff.php',
+	'DiffOp_Add' => 'includes/diff/DairikiDiff.php',
+	'DiffOp_Change' => 'includes/diff/DairikiDiff.php',
+	'DiffOp_Copy' => 'includes/diff/DairikiDiff.php',
+	'DiffOp_Delete' => 'includes/diff/DairikiDiff.php',
+	'HWLDF_WordAccumulator' => 'includes/diff/DairikiDiff.php',
+	'ArrayDiffFormatter' => 'includes/diff/ArrayDiffFormatter.php',
 	'Diff' => 'includes/diff/DairikiDiff.php',
 	'DifferenceEngine' => 'includes/diff/DifferenceEngine.php',
-	'DiffFormatter' => 'includes/diff/DairikiDiff.php',
+	'DiffFormatter' => 'includes/diff/DiffFormatter.php',
 	'MappedDiff' => 'includes/diff/DairikiDiff.php',
 	'RangeDifference' => 'includes/diff/WikiDiff3.php',
-	'TableDiffFormatter' => 'includes/diff/DairikiDiff.php',
-	'UnifiedDiffFormatter' => 'includes/diff/DairikiDiff.php',
+	'TableDiffFormatter' => 'includes/diff/TableDiffFormatter.php',
+	'UnifiedDiffFormatter' => 'includes/diff/UnifiedDiffFormatter.php',
 	'WikiDiff3' => 'includes/diff/WikiDiff3.php',
 	'WordLevelDiff' => 'includes/diff/DairikiDiff.php',
 
@@ -843,12 +843,14 @@ $wgAutoloadLocalClasses = array(
 	'ResourceLoaderNoscriptModule' => 'includes/resourceloader/ResourceLoaderNoscriptModule.php',
 	'ResourceLoaderSiteModule' => 'includes/resourceloader/ResourceLoaderSiteModule.php',
 	'ResourceLoaderStartUpModule' => 'includes/resourceloader/ResourceLoaderStartUpModule.php',
-	'ResourceLoaderUserCSSPrefsModule' => 'includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php',
+	'ResourceLoaderUserCSSPrefsModule' =>
+		'includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php',
 	'ResourceLoaderUserGroupsModule' => 'includes/resourceloader/ResourceLoaderUserGroupsModule.php',
 	'ResourceLoaderUserModule' => 'includes/resourceloader/ResourceLoaderUserModule.php',
 	'ResourceLoaderUserOptionsModule' => 'includes/resourceloader/ResourceLoaderUserOptionsModule.php',
 	'ResourceLoaderUserTokensModule' => 'includes/resourceloader/ResourceLoaderUserTokensModule.php',
-	'ResourceLoaderLanguageDataModule' => 'includes/resourceloader/ResourceLoaderLanguageDataModule.php',
+	'ResourceLoaderLanguageDataModule' =>
+		'includes/resourceloader/ResourceLoaderLanguageDataModule.php',
 	'ResourceLoaderWikiModule' => 'includes/resourceloader/ResourceLoaderWikiModule.php',
 
 	# includes/revisiondelete
@@ -1044,12 +1046,13 @@ $wgAutoloadLocalClasses = array(
 
 	# includes/utils
 	'ArrayUtils' => 'includes/utils/ArrayUtils.php',
+	'CdbException' => 'includes/utils/Cdb.php',
 	'CdbFunctions' => 'includes/utils/CdbPHP.php',
 	'CdbReader' => 'includes/utils/Cdb.php',
-	'CdbReaderDBA' => 'includes/utils/Cdb.php',
+	'CdbReaderDBA' => 'includes/utils/CdbDBA.php',
 	'CdbReaderPHP' => 'includes/utils/CdbPHP.php',
 	'CdbWriter' => 'includes/utils/Cdb.php',
-	'CdbWriterDBA' => 'includes/utils/Cdb.php',
+	'CdbWriterDBA' => 'includes/utils/CdbDBA.php',
 	'CdbWriterPHP' => 'includes/utils/CdbPHP.php',
 	'ConfEditor' => 'includes/utils/ConfEditor.php',
 	'ConfEditorParseError' => 'includes/utils/ConfEditor.php',
@@ -1112,13 +1115,13 @@ $wgAutoloadLocalClasses = array(
 	'UserDupes' => 'maintenance/userDupes.inc',
 
 	# maintenance/language
-	'csvStatsOutput' => 'maintenance/language/StatOutputs.php',
-	'extensionLanguages' => 'maintenance/language/languages.inc',
-	'languages' => 'maintenance/language/languages.inc',
+	'CsvStatsOutput' => 'maintenance/language/StatOutputs.php',
+	'ExtensionLanguages' => 'maintenance/language/languages.inc',
+	'Languages' => 'maintenance/language/languages.inc',
 	'MessageWriter' => 'maintenance/language/writeMessagesArray.inc',
-	'statsOutput' => 'maintenance/language/StatOutputs.php',
-	'textStatsOutput' => 'maintenance/language/StatOutputs.php',
-	'wikiStatsOutput' => 'maintenance/language/StatOutputs.php',
+	'StatsOutput' => 'maintenance/language/StatOutputs.php',
+	'TextStatsOutput' => 'maintenance/language/StatOutputs.php',
+	'WikiStatsOutput' => 'maintenance/language/StatOutputs.php',
 
 	# maintenance/term
 	'AnsiTermColorer' => 'maintenance/term/MWTerm.php',
@@ -1140,7 +1143,7 @@ $wgAutoloadLocalClasses = array(
 );
 
 class AutoLoader {
-	static protected  $autoloadLocalClassesLower = null;
+	static protected $autoloadLocalClassesLower = null;
 
 	/**
 	 * autoload - take a class name and attempt to load it
@@ -1163,6 +1166,8 @@ class AutoLoader {
 		// do not strip the leading backlash in this case, causing autoloading to fail.
 		$className = ltrim( $className, '\\' );
 
+		$filename = false;
+
 		if ( isset( $wgAutoloadLocalClasses[$className] ) ) {
 			$filename = $wgAutoloadLocalClasses[$className];
 		} elseif ( isset( $wgAutoloadClasses[$className] ) ) {
@@ -1175,7 +1180,6 @@ class AutoLoader {
 			 * and we are plagued with several legacy uses created by MediaWiki < 1.5, see
 			 * https://wikitech.wikimedia.org/wiki/Text_storage_data
 			 */
-			$filename = false;
 			$lowerClass = strtolower( $className );
 
 			if ( self::$autoloadLocalClassesLower === null ) {