From d18f921b575e922057e57797c7afd17ebf3cd10d Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sun, 20 Feb 2011 16:28:13 +0000 Subject: [PATCH] Per Tim Starling, follow-up r76252: move WikiDiff.php to DairikiDiff.php to not confuse with the wikidiff extension --- includes/AutoLoader.php | 28 +++++++++---------- .../diff/{WikiDiff.php => DairikiDiff.php} | 0 2 files changed, 14 insertions(+), 14 deletions(-) rename includes/diff/{WikiDiff.php => DairikiDiff.php} (100%) diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index 8b80825820..019c94dfbf 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -416,23 +416,23 @@ $wgAutoloadLocalClasses = array( 'IBM_DB2Field' => 'includes/db/DatabaseIbm_db2.php', # includes/diff - 'ArrayDiffFormatter' => 'includes/diff/WikiDiff.php', - '_DiffEngine' => 'includes/diff/WikiDiff.php', + 'ArrayDiffFormatter' => 'includes/diff/DairikiDiff.php', + '_DiffEngine' => 'includes/diff/DairikiDiff.php', 'DifferenceEngine' => 'includes/diff/DifferenceEngine.php', - 'DiffFormatter' => 'includes/diff/WikiDiff.php', - 'Diff' => 'includes/diff/WikiDiff.php', - '_DiffOp_Add' => 'includes/diff/WikiDiff.php', - '_DiffOp_Change' => 'includes/diff/WikiDiff.php', - '_DiffOp_Copy' => 'includes/diff/WikiDiff.php', - '_DiffOp_Delete' => 'includes/diff/WikiDiff.php', - '_DiffOp' => 'includes/diff/WikiDiff.php', - '_HWLDF_WordAccumulator' => 'includes/diff/WikiDiff.php', - 'MappedDiff' => 'includes/diff/WikiDiff.php', + 'DiffFormatter' => 'includes/diff/DairikiDiff.php', + 'Diff' => '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', + '_DiffOp' => 'includes/diff/DairikiDiff.php', + '_HWLDF_WordAccumulator' => 'includes/diff/DairikiDiff.php', + 'MappedDiff' => 'includes/diff/DairikiDiff.php', 'RangeDifference' => 'includes/diff/WikiDiff3.php', - 'TableDiffFormatter' => 'includes/diff/WikiDiff.php', - 'UnifiedDiffFormatter' => 'includes/diff/WikiDiff.php', + 'TableDiffFormatter' => 'includes/diff/DairikiDiff.php', + 'UnifiedDiffFormatter' => 'includes/diff/DairikiDiff.php', 'WikiDiff3' => 'includes/diff/WikiDiff3.php', - 'WordLevelDiff' => 'includes/diff/WikiDiff.php', + 'WordLevelDiff' => 'includes/diff/DairikiDiff.php', # includes/filerepo 'ArchivedFile' => 'includes/filerepo/ArchivedFile.php', diff --git a/includes/diff/WikiDiff.php b/includes/diff/DairikiDiff.php similarity index 100% rename from includes/diff/WikiDiff.php rename to includes/diff/DairikiDiff.php -- 2.20.1