From 3afabc850df031618a898dc3e9ca33e09efeb4d4 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 19 Jun 2008 21:02:23 +0000 Subject: [PATCH] Revert r36413 -- renaming of search files into 'search' subdirectory The loss of specific names would create a visible name conflict; when you've got "MySQL.php" open, what the hell is it? Is it the DatabaseMySQL class? Some other random MySQL-related thing? Update.php is also confusing -- we have an update.php which is a command-line script. Don't do these confusing names; there's no pressing functional need to move the files at all, but if you must move them at least keep their distinct names so I can find my code. --- includes/AutoLoader.php | 32 +++++++++---------- .../{search/Engine.php => SearchEngine.php} | 0 .../{search/MySQL.php => SearchMySQL.php} | 0 .../{search/MySQL4.php => SearchMySQL4.php} | 0 .../{search/Oracle.php => SearchOracle.php} | 0 .../Postgres.php => SearchPostgres.php} | 0 .../Tsearch2.php => SearchTsearch2.php} | 0 .../{search/Update.php => SearchUpdate.php} | 0 8 files changed, 16 insertions(+), 16 deletions(-) rename includes/{search/Engine.php => SearchEngine.php} (100%) rename includes/{search/MySQL.php => SearchMySQL.php} (100%) rename includes/{search/MySQL4.php => SearchMySQL4.php} (100%) rename includes/{search/Oracle.php => SearchOracle.php} (100%) rename includes/{search/Postgres.php => SearchPostgres.php} (100%) rename includes/{search/Tsearch2.php => SearchTsearch2.php} (100%) rename includes/{search/Update.php => SearchUpdate.php} (100%) diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index ce8e610258..2f0726a402 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -126,10 +126,10 @@ class AutoLoader { 'MimeMagic' => 'includes/MimeMagic.php', 'MWException' => 'includes/Exception.php', 'MWNamespace' => 'includes/Namespace.php', - 'MySQLSearchResultSet' => 'includes/search/MySQL.php', + 'MySQLSearchResultSet' => 'includes/SearchMySQL.php', 'Namespace' => 'includes/NamespaceCompat.php', // Compat 'OldChangesList' => 'includes/ChangesList.php', - 'OracleSearchResultSet' => 'includes/search/Oracle.php', + 'OracleSearchResultSet' => 'includes/SearchOracle.php', 'OutputPage' => 'includes/OutputPage.php', 'PageHistory' => 'includes/PageHistory.php', 'PageHistoryPager' => 'includes/PageHistory.php', @@ -137,8 +137,8 @@ class AutoLoader { 'Pager' => 'includes/Pager.php', 'PasswordError' => 'includes/User.php', 'PatrolLog' => 'includes/PatrolLog.php', - 'PostgresSearchResult' => 'includes/search/Postgres.php', - 'PostgresSearchResultSet' => 'includes/search/Postgres.php', + 'PostgresSearchResult' => 'includes/SearchPostgres.php', + 'PostgresSearchResultSet' => 'includes/SearchPostgres.php', 'PrefixSearch' => 'includes/PrefixSearch.php', 'Profiler' => 'includes/Profiler.php', 'ProfilerSimple' => 'includes/ProfilerSimple.php', @@ -158,18 +158,18 @@ class AutoLoader { 'Revision' => 'includes/Revision.php', 'RSSFeed' => 'includes/Feed.php', 'Sanitizer' => 'includes/Sanitizer.php', - 'SearchEngineDummy' => 'includes/search/Engine.php', - 'SearchEngine' => 'includes/search/Engine.php', - 'SearchHighlighter' => 'includes/search/Engine.php', - 'SearchMySQL4' => 'includes/search/MySQL4.php', - 'SearchMySQL' => 'includes/search/MySQL.php', - 'SearchOracle' => 'includes/search/Oracle.php', - 'SearchPostgres' => 'includes/search/Postgres.php', - 'SearchResult' => 'includes/search/Engine.php', - 'SearchResultSet' => 'includes/search/Engine.php', - 'SearchResultTooMany' => 'includes/search/Engine.php', - 'SearchUpdate' => 'includes/search/Update.php', - 'SearchUpdateMyISAM' => 'includes/search/Update.php', + 'SearchEngineDummy' => 'includes/SearchEngine.php', + 'SearchEngine' => 'includes/SearchEngine.php', + 'SearchHighlighter' => 'includes/SearchEngine.php', + 'SearchMySQL4' => 'includes/SearchMySQL4.php', + 'SearchMySQL' => 'includes/SearchMySQL.php', + 'SearchOracle' => 'includes/SearchOracle.php', + 'SearchPostgres' => 'includes/SearchPostgres.php', + 'SearchResult' => 'includes/SearchEngine.php', + 'SearchResultSet' => 'includes/SearchEngine.php', + 'SearchResultTooMany' => 'includes/SearchEngine.php', + 'SearchUpdate' => 'includes/SearchUpdate.php', + 'SearchUpdateMyISAM' => 'includes/SearchUpdate.php', 'SiteConfiguration' => 'includes/SiteConfiguration.php', 'SiteStats' => 'includes/SiteStats.php', 'SiteStatsUpdate' => 'includes/SiteStats.php', diff --git a/includes/search/Engine.php b/includes/SearchEngine.php similarity index 100% rename from includes/search/Engine.php rename to includes/SearchEngine.php diff --git a/includes/search/MySQL.php b/includes/SearchMySQL.php similarity index 100% rename from includes/search/MySQL.php rename to includes/SearchMySQL.php diff --git a/includes/search/MySQL4.php b/includes/SearchMySQL4.php similarity index 100% rename from includes/search/MySQL4.php rename to includes/SearchMySQL4.php diff --git a/includes/search/Oracle.php b/includes/SearchOracle.php similarity index 100% rename from includes/search/Oracle.php rename to includes/SearchOracle.php diff --git a/includes/search/Postgres.php b/includes/SearchPostgres.php similarity index 100% rename from includes/search/Postgres.php rename to includes/SearchPostgres.php diff --git a/includes/search/Tsearch2.php b/includes/SearchTsearch2.php similarity index 100% rename from includes/search/Tsearch2.php rename to includes/SearchTsearch2.php diff --git a/includes/search/Update.php b/includes/SearchUpdate.php similarity index 100% rename from includes/search/Update.php rename to includes/SearchUpdate.php -- 2.20.1