From 567f244e3611c9e020bc69446a77a10c21257f84 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Mon, 3 Aug 2009 21:56:41 +0000 Subject: [PATCH] Revert r54244 which was stupid and fix this properly. Require commandLine.inc/Maintenance.php using the full path every time. --- RELEASE-NOTES | 2 ++ maintenance/addwiki.php | 2 +- maintenance/attachLatest.php | 2 +- maintenance/benchmarkPurge.php | 2 +- maintenance/cdb-test.php | 2 +- maintenance/changePassword.php | 2 +- maintenance/checkAutoLoader.php | 2 +- maintenance/checkBadRedirects.php | 2 +- maintenance/checkImages.php | 2 +- maintenance/checkUsernames.php | 2 +- maintenance/cleanupCaps.php | 2 +- maintenance/cleanupImages.php | 2 +- maintenance/cleanupSpam.php | 2 +- maintenance/cleanupTitles.php | 2 +- maintenance/cleanupWatchlist.php | 2 +- maintenance/clear_interwiki_cache.php | 2 +- maintenance/clear_stats.php | 2 +- maintenance/convertLinks.php | 2 +- maintenance/convertUserOptions.php | 2 +- maintenance/createAndPromote.php | 2 +- maintenance/deleteArchivedFiles.php | 2 +- maintenance/deleteArchivedRevisions.php | 2 +- maintenance/deleteBatch.php | 2 +- maintenance/deleteDefaultMessages.php | 2 +- maintenance/deleteImageMemcached.php | 2 +- maintenance/deleteOldRevisions.php | 2 +- maintenance/deleteOrphanedRevisions.php | 2 +- maintenance/deleteRevision.php | 2 +- maintenance/dumpBackup.php | 2 +- maintenance/dumpInterwiki.php | 2 +- maintenance/dumpLinks.php | 2 +- maintenance/dumpSisterSites.php | 2 +- maintenance/dumpTextPass.php | 2 +- maintenance/dumpUploads.php | 2 +- maintenance/edit.php | 2 +- maintenance/eval.php | 2 +- maintenance/fetchText.php | 2 +- maintenance/findhooks.php | 2 +- maintenance/fixSlaveDesync.php | 2 +- maintenance/fixTimestamps.php | 2 +- maintenance/fixUserRegistration.php | 2 +- maintenance/fuzz-tester.php | 2 +- maintenance/generateSitemap.php | 2 +- maintenance/getLagTimes.php | 2 +- maintenance/getSlaveServer.php | 2 +- maintenance/http_session_download.php | 2 +- maintenance/importDump.php | 2 +- maintenance/importImages.php | 2 +- maintenance/importTextFile.php | 2 +- maintenance/initEditCount.php | 2 +- maintenance/initStats.php | 2 +- maintenance/installExtension.php | 2 +- maintenance/mcc.php | 2 +- maintenance/mctest.php | 2 +- maintenance/moveBatch.php | 2 +- maintenance/namespaceDupes.php | 2 +- maintenance/nextJobDB.php | 2 +- maintenance/nukeNS.php | 2 +- maintenance/nukePage.php | 2 +- maintenance/orphans.php | 2 +- maintenance/parserTests.inc | 2 +- maintenance/patchSql.php | 2 +- maintenance/populateCategory.php | 2 +- maintenance/populateLogSearch.php | 2 +- maintenance/populateLogUsertext.php | 2 +- maintenance/populateParentId.php | 2 +- maintenance/preprocessorFuzzTest.php | 2 +- maintenance/protect.php | 2 +- maintenance/purgeList.php | 2 +- maintenance/purgeOldText.php | 2 +- maintenance/reassignEdits.php | 2 +- maintenance/rebuildFileCache.php | 2 +- maintenance/rebuildImages.php | 2 +- maintenance/rebuildInterwiki.php | 2 +- maintenance/rebuildLocalisationCache.php | 2 +- maintenance/rebuildall.php | 2 +- maintenance/rebuildmessages.php | 2 +- maintenance/rebuildrecentchanges.php | 2 +- maintenance/rebuildtextindex.php | 2 +- maintenance/refreshImageCount.php | 2 +- maintenance/refreshLinks.php | 2 +- maintenance/removeUnusedAccounts.php | 2 +- maintenance/renameDbPrefix.php | 2 +- maintenance/renamewiki.php | 2 +- maintenance/renderDump.php | 2 +- maintenance/runJobs.php | 2 +- maintenance/showJobs.php | 2 +- maintenance/showStats.php | 2 +- maintenance/sql.php | 2 +- maintenance/stats.php | 2 +- maintenance/undelete.php | 2 +- maintenance/update.php | 2 +- maintenance/updateArticleCount.php | 2 +- maintenance/updateRestrictions.php | 2 +- maintenance/updateSearchIndex.php | 2 +- maintenance/updateSpecialPages.php | 2 +- maintenance/upgrade1_5.php | 2 +- maintenance/userOptions.inc | 2 +- maintenance/waitForSlave.php | 2 +- 99 files changed, 100 insertions(+), 98 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index b47c679e28..607af0ec60 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -378,6 +378,8 @@ this. Was used when mwEmbed was going to be an extension. * (bug 18699) Using the nosummary URL option no longer triggers the "You have not provided a summary" warning for those who activated it in their preferences +* (bug 18855) commandLine.inc and Maintenance.php are now properly included + using the full path == API changes in 1.16 == diff --git a/maintenance/addwiki.php b/maintenance/addwiki.php index 57513dc636..787414cc23 100644 --- a/maintenance/addwiki.php +++ b/maintenance/addwiki.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class AddWiki extends Maintenance { public function __construct() { diff --git a/maintenance/attachLatest.php b/maintenance/attachLatest.php index 71d5c791f1..fa07649b38 100644 --- a/maintenance/attachLatest.php +++ b/maintenance/attachLatest.php @@ -24,7 +24,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class AttachLatest extends Maintenance { diff --git a/maintenance/benchmarkPurge.php b/maintenance/benchmarkPurge.php index ee5af780bc..d167cf92e3 100644 --- a/maintenance/benchmarkPurge.php +++ b/maintenance/benchmarkPurge.php @@ -20,7 +20,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class BenchmarkPurge extends Maintenance { diff --git a/maintenance/cdb-test.php b/maintenance/cdb-test.php index b980541da3..b6f23c4dce 100644 --- a/maintenance/cdb-test.php +++ b/maintenance/cdb-test.php @@ -4,7 +4,7 @@ * Test the CDB reader/writer */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class CdbTest extends Maintenance { public function __construct() { diff --git a/maintenance/changePassword.php b/maintenance/changePassword.php index 10ed826929..69043b2d1d 100644 --- a/maintenance/changePassword.php +++ b/maintenance/changePassword.php @@ -23,7 +23,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class ChangePassword extends Maintenance { public function __construct() { diff --git a/maintenance/checkAutoLoader.php b/maintenance/checkAutoLoader.php index 90ef9967ff..9c8f29e364 100644 --- a/maintenance/checkAutoLoader.php +++ b/maintenance/checkAutoLoader.php @@ -20,7 +20,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class CheckAutoLoader extends Maintenance { public function __construct() { diff --git a/maintenance/checkBadRedirects.php b/maintenance/checkBadRedirects.php index 87ecaaea59..32f04f45d0 100644 --- a/maintenance/checkBadRedirects.php +++ b/maintenance/checkBadRedirects.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class CheckBadRedirects extends Maintenance { public function __construct() { diff --git a/maintenance/checkImages.php b/maintenance/checkImages.php index 71743dc757..5dcaac2849 100644 --- a/maintenance/checkImages.php +++ b/maintenance/checkImages.php @@ -19,7 +19,7 @@ * * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class CheckImages extends Maintenance { diff --git a/maintenance/checkUsernames.php b/maintenance/checkUsernames.php index 7b7f11f1d2..e1754d34dc 100644 --- a/maintenance/checkUsernames.php +++ b/maintenance/checkUsernames.php @@ -23,7 +23,7 @@ */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class CheckUsernames extends Maintenance { diff --git a/maintenance/cleanupCaps.php b/maintenance/cleanupCaps.php index 46ca18d68f..17fddef331 100644 --- a/maintenance/cleanupCaps.php +++ b/maintenance/cleanupCaps.php @@ -31,7 +31,7 @@ $optionsWithArgs = array( 'namespace' ); -require_once( 'commandLine.inc' ); +require_once( dirname(__FILE__) . '/commandLine.inc' ); require_once( 'cleanupTable.inc' ); /** diff --git a/maintenance/cleanupImages.php b/maintenance/cleanupImages.php index 00903f2222..a173078e89 100644 --- a/maintenance/cleanupImages.php +++ b/maintenance/cleanupImages.php @@ -29,7 +29,7 @@ * @ingroup Maintenance */ -require_once( 'commandLine.inc' ); +require_once( dirname(__FILE__) . '/commandLine.inc' ); require_once( 'cleanupTable.inc' ); /** diff --git a/maintenance/cleanupSpam.php b/maintenance/cleanupSpam.php index 78f117c2ba..7da4a24a1f 100644 --- a/maintenance/cleanupSpam.php +++ b/maintenance/cleanupSpam.php @@ -20,7 +20,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class CleanupSpam extends Maintenance { public function __construct() { diff --git a/maintenance/cleanupTitles.php b/maintenance/cleanupTitles.php index 4d76ac7ac7..71591f406d 100644 --- a/maintenance/cleanupTitles.php +++ b/maintenance/cleanupTitles.php @@ -29,7 +29,7 @@ * @ingroup Maintenance */ -require_once( 'commandLine.inc' ); +require_once( dirname(__FILE__) . '/commandLine.inc' ); require_once( 'cleanupTable.inc' ); /** diff --git a/maintenance/cleanupWatchlist.php b/maintenance/cleanupWatchlist.php index bfc3a1e284..89d7aee8f4 100644 --- a/maintenance/cleanupWatchlist.php +++ b/maintenance/cleanupWatchlist.php @@ -29,7 +29,7 @@ * @ingroup Maintenance */ -require_once( 'commandLine.inc' ); +require_once( dirname(__FILE__) . '/commandLine.inc' ); require_once( 'cleanupTable.inc' ); /** diff --git a/maintenance/clear_interwiki_cache.php b/maintenance/clear_interwiki_cache.php index ad0e0d0608..8f6c2eb226 100644 --- a/maintenance/clear_interwiki_cache.php +++ b/maintenance/clear_interwiki_cache.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class ClearInterwikiCache extends Maintenance { diff --git a/maintenance/clear_stats.php b/maintenance/clear_stats.php index 1c5eaaeb44..6a6a498194 100644 --- a/maintenance/clear_stats.php +++ b/maintenance/clear_stats.php @@ -20,7 +20,7 @@ * @ingroup Maintenance */ -require_once( 'Maintenance.php' ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class clear_stats extends Maintenance { diff --git a/maintenance/convertLinks.php b/maintenance/convertLinks.php index 32a483eeba..415662a0c1 100644 --- a/maintenance/convertLinks.php +++ b/maintenance/convertLinks.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class ConvertLinks extends Maintenance { diff --git a/maintenance/convertUserOptions.php b/maintenance/convertUserOptions.php index 0f018b487a..1d589191d1 100644 --- a/maintenance/convertUserOptions.php +++ b/maintenance/convertUserOptions.php @@ -20,7 +20,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class ConvertUserOptions extends Maintenance { diff --git a/maintenance/createAndPromote.php b/maintenance/createAndPromote.php index 0a18596e77..694f9992c8 100644 --- a/maintenance/createAndPromote.php +++ b/maintenance/createAndPromote.php @@ -22,7 +22,7 @@ * @author Rob Church */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class CreateAndPromote extends Maintenance { diff --git a/maintenance/deleteArchivedFiles.php b/maintenance/deleteArchivedFiles.php index 171d5d40c4..678af5e033 100644 --- a/maintenance/deleteArchivedFiles.php +++ b/maintenance/deleteArchivedFiles.php @@ -23,7 +23,7 @@ * Based on deleteOldRevisions.php by Rob Church */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class DeleteArchivedFiles extends Maintenance { public function __construct() { diff --git a/maintenance/deleteArchivedRevisions.php b/maintenance/deleteArchivedRevisions.php index 98e4aff6e3..c3f8bf11e1 100644 --- a/maintenance/deleteArchivedRevisions.php +++ b/maintenance/deleteArchivedRevisions.php @@ -23,7 +23,7 @@ * Shamelessly stolen from deleteOldRevisions.php by Rob Church :) */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class DeleteArchivedRevisions extends Maintenance { public function __construct() { diff --git a/maintenance/deleteBatch.php b/maintenance/deleteBatch.php index 0d6dac939b..6aecda7d7d 100644 --- a/maintenance/deleteBatch.php +++ b/maintenance/deleteBatch.php @@ -27,7 +27,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class DeleteBatch extends Maintenance { diff --git a/maintenance/deleteDefaultMessages.php b/maintenance/deleteDefaultMessages.php index 305eb419a0..65216c1f9c 100644 --- a/maintenance/deleteDefaultMessages.php +++ b/maintenance/deleteDefaultMessages.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class DeleteDefaultMessages extends Maintenance { public function __construct() { diff --git a/maintenance/deleteImageMemcached.php b/maintenance/deleteImageMemcached.php index 73712d17e9..d33c9af8b7 100644 --- a/maintenance/deleteImageMemcached.php +++ b/maintenance/deleteImageMemcached.php @@ -23,7 +23,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class DeleteImageCache extends Maintenance { public function __construct() { diff --git a/maintenance/deleteOldRevisions.php b/maintenance/deleteOldRevisions.php index 7084751859..05d8532e55 100644 --- a/maintenance/deleteOldRevisions.php +++ b/maintenance/deleteOldRevisions.php @@ -22,7 +22,7 @@ * @author Rob Church */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class DeleteOldRevisions extends Maintenance { public function __construct() { diff --git a/maintenance/deleteOrphanedRevisions.php b/maintenance/deleteOrphanedRevisions.php index 79e9e63b8c..603408c951 100644 --- a/maintenance/deleteOrphanedRevisions.php +++ b/maintenance/deleteOrphanedRevisions.php @@ -24,7 +24,7 @@ * @todo More efficient cleanup of text records */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class DeleteOrphanedRevisions extends Maintenance { public function __construct() { diff --git a/maintenance/deleteRevision.php b/maintenance/deleteRevision.php index cb84085aa1..dd8bf137d2 100644 --- a/maintenance/deleteRevision.php +++ b/maintenance/deleteRevision.php @@ -20,7 +20,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class DeleteRevision extends Maintenance { diff --git a/maintenance/dumpBackup.php b/maintenance/dumpBackup.php index 40d9b56708..3f4530edbd 100644 --- a/maintenance/dumpBackup.php +++ b/maintenance/dumpBackup.php @@ -26,7 +26,7 @@ $originalDir = getcwd(); $optionsWithArgs = array( 'pagelist', 'start', 'end' ); -require_once( 'commandLine.inc' ); +require_once( dirname(__FILE__) . '/commandLine.inc' ); require_once( 'backup.inc' ); $dumper = new BackupDumper( $argv ); diff --git a/maintenance/dumpInterwiki.php b/maintenance/dumpInterwiki.php index 16bf4db004..c4f44acf85 100644 --- a/maintenance/dumpInterwiki.php +++ b/maintenance/dumpInterwiki.php @@ -12,7 +12,7 @@ $oldCwd = getcwd(); $optionsWithArgs = array( "o" ); -require( "commandLine.inc" ); +require_once( dirname(__FILE__) . '/commandLine.inc' ); require( "dumpInterwiki.inc" ); chdir( $oldCwd ); diff --git a/maintenance/dumpLinks.php b/maintenance/dumpLinks.php index 83ee6656c0..1cb70d019c 100644 --- a/maintenance/dumpLinks.php +++ b/maintenance/dumpLinks.php @@ -29,7 +29,7 @@ * @ingroup Mainatenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class DumpLinks extends Maintenance { public function __construct() { diff --git a/maintenance/dumpSisterSites.php b/maintenance/dumpSisterSites.php index 5b397b7be6..9e8f6377b0 100644 --- a/maintenance/dumpSisterSites.php +++ b/maintenance/dumpSisterSites.php @@ -24,7 +24,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class DumpSisterSites extends Maintenance { public function __construct() { diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php index 3d75131474..38420ee654 100644 --- a/maintenance/dumpTextPass.php +++ b/maintenance/dumpTextPass.php @@ -24,7 +24,7 @@ $originalDir = getcwd(); -require_once( 'commandLine.inc' ); +require_once( dirname(__FILE__) . '/commandLine.inc' ); require_once( 'backup.inc' ); /** diff --git a/maintenance/dumpUploads.php b/maintenance/dumpUploads.php index ec549e63e8..c8f1667b08 100644 --- a/maintenance/dumpUploads.php +++ b/maintenance/dumpUploads.php @@ -20,7 +20,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class UploadDumper extends Maintenance { public function __construct() { diff --git a/maintenance/edit.php b/maintenance/edit.php index 8a7cd46ec2..d7360907e9 100644 --- a/maintenance/edit.php +++ b/maintenance/edit.php @@ -20,7 +20,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class EditCLI extends Maintenance { public function __construct() { diff --git a/maintenance/eval.php b/maintenance/eval.php index b1b130858c..c25c8d63ea 100644 --- a/maintenance/eval.php +++ b/maintenance/eval.php @@ -30,7 +30,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class EvalPrompt extends Maintenance { diff --git a/maintenance/fetchText.php b/maintenance/fetchText.php index 76e0dd1c43..746ef8ad93 100644 --- a/maintenance/fetchText.php +++ b/maintenance/fetchText.php @@ -20,7 +20,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class FetchText extends Maintenance { public function __construct() { diff --git a/maintenance/findhooks.php b/maintenance/findhooks.php index c10e1138f4..da50b2edaf 100644 --- a/maintenance/findhooks.php +++ b/maintenance/findhooks.php @@ -34,7 +34,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public Licence 2.0 or later */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class FindHooks extends Maintenance { public function __construct() { diff --git a/maintenance/fixSlaveDesync.php b/maintenance/fixSlaveDesync.php index 71492eb0be..57999a5a57 100644 --- a/maintenance/fixSlaveDesync.php +++ b/maintenance/fixSlaveDesync.php @@ -18,7 +18,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class FixSlaveDesync extends Maintenance { public function __construct() { diff --git a/maintenance/fixTimestamps.php b/maintenance/fixTimestamps.php index c9589f5999..8d89e09872 100644 --- a/maintenance/fixTimestamps.php +++ b/maintenance/fixTimestamps.php @@ -24,7 +24,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class FixTimestamps extends Maintenance { public function __construct() { diff --git a/maintenance/fixUserRegistration.php b/maintenance/fixUserRegistration.php index 15c00b3d49..46c9fae4f4 100644 --- a/maintenance/fixUserRegistration.php +++ b/maintenance/fixUserRegistration.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class FixUserRegistration extends Maintenance { public function __construct() { diff --git a/maintenance/fuzz-tester.php b/maintenance/fuzz-tester.php index da1680b214..e310ee0e07 100644 --- a/maintenance/fuzz-tester.php +++ b/maintenance/fuzz-tester.php @@ -169,7 +169,7 @@ TODO: /////////////////////////// COMMAND LINE HELP //////////////////////////////////// // This is a command line script, load MediaWiki env (gives command line options); -require('commandLine.inc'); +require_once( dirname(__FILE__) . '/commandLine.inc' ); // if the user asked for an explanation of command line options. if ( isset( $options["help"] ) ) { diff --git a/maintenance/generateSitemap.php b/maintenance/generateSitemap.php index 7ac197be01..a2cad76a2c 100644 --- a/maintenance/generateSitemap.php +++ b/maintenance/generateSitemap.php @@ -31,7 +31,7 @@ define( 'GS_TALK', -1 ); * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class GenerateSitemap extends Maintenance { /** diff --git a/maintenance/getLagTimes.php b/maintenance/getLagTimes.php index 9c9f6b18a1..bc14ae718e 100644 --- a/maintenance/getLagTimes.php +++ b/maintenance/getLagTimes.php @@ -18,7 +18,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class GetLagTimes extends Maintenance { public function __construct() { diff --git a/maintenance/getSlaveServer.php b/maintenance/getSlaveServer.php index f164ec318e..eac97a591e 100644 --- a/maintenance/getSlaveServer.php +++ b/maintenance/getSlaveServer.php @@ -20,7 +20,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class GetSlaveServer extends Maintenance { public function __construct() { diff --git a/maintenance/http_session_download.php b/maintenance/http_session_download.php index cb56297132..40c24aa246 100644 --- a/maintenance/http_session_download.php +++ b/maintenance/http_session_download.php @@ -13,7 +13,7 @@ $optionsWithArgs = Array('sid', 'usk'); //act like a "normal user" $wgUseNormalUser = true; -require_once( 'commandLine.inc' ); +require_once( dirname(__FILE__) . '/commandLine.inc' ); if(!isset($options['sid']) || !isset($options['usk'])){ print<< true/*, 'debug' => true*/) ); $mcc->set_servers( $wgMemCachedServers ); diff --git a/maintenance/mctest.php b/maintenance/mctest.php index 63bc3dd66d..b77ffcbc77 100644 --- a/maintenance/mctest.php +++ b/maintenance/mctest.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class mcTest extends Maintenance { public function __construct() { diff --git a/maintenance/moveBatch.php b/maintenance/moveBatch.php index 5f0e3d663a..878b6492ef 100644 --- a/maintenance/moveBatch.php +++ b/maintenance/moveBatch.php @@ -33,7 +33,7 @@ * e.g. immobile_namespace for namespaces which can't be moved */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class MoveBatch extends Maintenance { public function __construct() { diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php index fac1291fd0..5b010e84af 100644 --- a/maintenance/namespaceDupes.php +++ b/maintenance/namespaceDupes.php @@ -23,7 +23,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class NamespaceConflictChecker extends Maintenance { public function __construct() { diff --git a/maintenance/nextJobDB.php b/maintenance/nextJobDB.php index c0a8b59522..10528d45b7 100644 --- a/maintenance/nextJobDB.php +++ b/maintenance/nextJobDB.php @@ -20,7 +20,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class nextJobDB extends Maintenance { public function __construct() { diff --git a/maintenance/nukeNS.php b/maintenance/nukeNS.php index 08232d29e6..b18493890b 100644 --- a/maintenance/nukeNS.php +++ b/maintenance/nukeNS.php @@ -33,7 +33,7 @@ * based on nukePage by Rob Church */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class NukeNS extends Maintenance { public function __construct() { diff --git a/maintenance/nukePage.php b/maintenance/nukePage.php index eb8f16684d..cb0d3aa8e3 100644 --- a/maintenance/nukePage.php +++ b/maintenance/nukePage.php @@ -22,7 +22,7 @@ * @author Rob Church */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class NukePage extends Maintenance { public function __construct() { diff --git a/maintenance/orphans.php b/maintenance/orphans.php index 6e68a82fc3..cbcf228a21 100644 --- a/maintenance/orphans.php +++ b/maintenance/orphans.php @@ -27,7 +27,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class Orphans extends Maintenance { public function __construct() { diff --git a/maintenance/parserTests.inc b/maintenance/parserTests.inc index 926e19e256..16307bafbc 100644 --- a/maintenance/parserTests.inc +++ b/maintenance/parserTests.inc @@ -28,7 +28,7 @@ $options = array( 'quick', 'color', 'quiet', 'help', 'show-output', 'record'. 'run-disabled' ); $optionsWithArgs = array( 'regex', 'seed', 'setversion' ); -require_once( 'commandLine.inc' ); +require_once( dirname(__FILE__) . '/commandLine.inc' ); require_once( "$IP/maintenance/parserTestsParserHook.php" ); require_once( "$IP/maintenance/parserTestsStaticParserHook.php" ); require_once( "$IP/maintenance/parserTestsParserTime.php" ); diff --git a/maintenance/patchSql.php b/maintenance/patchSql.php index 0629b33b44..8fbe58abd6 100644 --- a/maintenance/patchSql.php +++ b/maintenance/patchSql.php @@ -7,7 +7,7 @@ * @ingroup Maintenance */ -require_once 'commandLine.inc'; +require_once( dirname(__FILE__) . '/commandLine.inc' ); require_once "$IP/maintenance/updaters.inc"; if( $args ) { diff --git a/maintenance/populateCategory.php b/maintenance/populateCategory.php index af9f219fe7..bf84bb0a41 100644 --- a/maintenance/populateCategory.php +++ b/maintenance/populateCategory.php @@ -7,7 +7,7 @@ $optionsWithArgs = array( 'begin', 'max-slave-lag', 'throttle' ); -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class PopulateCategory extends Maintenance { diff --git a/maintenance/populateLogSearch.php b/maintenance/populateLogSearch.php index 4d247542ac..0e53e1e6fd 100644 --- a/maintenance/populateLogSearch.php +++ b/maintenance/populateLogSearch.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class PopulateLogSearch extends Maintenance { diff --git a/maintenance/populateLogUsertext.php b/maintenance/populateLogUsertext.php index 359ee95bae..ff5b1fc746 100644 --- a/maintenance/populateLogUsertext.php +++ b/maintenance/populateLogUsertext.php @@ -23,7 +23,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class PopulateLogUsertext extends Maintenance { public function __construct() { diff --git a/maintenance/populateParentId.php b/maintenance/populateParentId.php index 8114b9d636..bf81cb688d 100644 --- a/maintenance/populateParentId.php +++ b/maintenance/populateParentId.php @@ -22,7 +22,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class PopulateParentId extends Maintenance { public function __construct() { diff --git a/maintenance/preprocessorFuzzTest.php b/maintenance/preprocessorFuzzTest.php index 0569730a4b..008a4b403a 100644 --- a/maintenance/preprocessorFuzzTest.php +++ b/maintenance/preprocessorFuzzTest.php @@ -4,7 +4,7 @@ * @ingroup Maintenance */ -require_once( 'commandLine.inc' ); +require_once( dirname(__FILE__) . '/commandLine.inc' ); $wgHooks['BeforeParserFetchTemplateAndtitle'][] = 'PPFuzzTester::templateHook'; diff --git a/maintenance/protect.php b/maintenance/protect.php index 6606746f45..126707a725 100644 --- a/maintenance/protect.php +++ b/maintenance/protect.php @@ -18,7 +18,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class Protect extends Maintenance { public function __construct() { diff --git a/maintenance/purgeList.php b/maintenance/purgeList.php index a267171c6b..7168a20314 100644 --- a/maintenance/purgeList.php +++ b/maintenance/purgeList.php @@ -20,7 +20,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class PurgeList extends Maintenance { public function __construct() { diff --git a/maintenance/purgeOldText.php b/maintenance/purgeOldText.php index 9e078b800b..9621cb39f8 100644 --- a/maintenance/purgeOldText.php +++ b/maintenance/purgeOldText.php @@ -21,7 +21,7 @@ * @author Rob Church */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class PurgeOldText extends Maintenance { public function __construct() { diff --git a/maintenance/reassignEdits.php b/maintenance/reassignEdits.php index 714d24335e..926ee5cc80 100644 --- a/maintenance/reassignEdits.php +++ b/maintenance/reassignEdits.php @@ -22,7 +22,7 @@ * @licence GNU General Public Licence 2.0 or later */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class ReassignEdits extends Maintenance { public function __construct() { diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php index 7cfd3fa513..7b3be7d23b 100644 --- a/maintenance/rebuildFileCache.php +++ b/maintenance/rebuildFileCache.php @@ -20,7 +20,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class RebuildFileCache extends Maintenance { public function __construct() { diff --git a/maintenance/rebuildImages.php b/maintenance/rebuildImages.php index 46b5d0ed83..d4515ffeae 100644 --- a/maintenance/rebuildImages.php +++ b/maintenance/rebuildImages.php @@ -32,7 +32,7 @@ $options = array( 'missing', 'dry-run' ); -require_once( 'commandLine.inc' ); +require_once( dirname(__FILE__) . '/commandLine.inc' ); require_once( 'FiveUpgrade.inc' ); class ImageBuilder extends FiveUpgrade { diff --git a/maintenance/rebuildInterwiki.php b/maintenance/rebuildInterwiki.php index 8a25ce3c1e..93b4f5e7aa 100644 --- a/maintenance/rebuildInterwiki.php +++ b/maintenance/rebuildInterwiki.php @@ -12,7 +12,7 @@ $oldCwd = getcwd(); $optionsWithArgs = array( "d" ); -require( "commandLine.inc" ); +require_once( dirname(__FILE__) . '/commandLine.inc' ); require( "rebuildInterwiki.inc" ); chdir( $oldCwd ); diff --git a/maintenance/rebuildLocalisationCache.php b/maintenance/rebuildLocalisationCache.php index 1e7a747449..a08efcabbc 100644 --- a/maintenance/rebuildLocalisationCache.php +++ b/maintenance/rebuildLocalisationCache.php @@ -28,7 +28,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class RebuildLocalisationCache extends Maintenance { public function __construct() { diff --git a/maintenance/rebuildall.php b/maintenance/rebuildall.php index 4d743e668c..a27eca68c8 100644 --- a/maintenance/rebuildall.php +++ b/maintenance/rebuildall.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class RebuildAll extends Maintenance { public function __construct() { diff --git a/maintenance/rebuildmessages.php b/maintenance/rebuildmessages.php index 2afbc3fcd4..546d52140f 100644 --- a/maintenance/rebuildmessages.php +++ b/maintenance/rebuildmessages.php @@ -20,7 +20,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class RebuildMessages extends Maintenance { public function __construct() { diff --git a/maintenance/rebuildrecentchanges.php b/maintenance/rebuildrecentchanges.php index 13e57053fc..54cdbccb48 100644 --- a/maintenance/rebuildrecentchanges.php +++ b/maintenance/rebuildrecentchanges.php @@ -22,7 +22,7 @@ * @todo Document */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class RebuildRecentchanges extends Maintenance { public function __construct() { diff --git a/maintenance/rebuildtextindex.php b/maintenance/rebuildtextindex.php index 17b261f98d..64b80aa095 100644 --- a/maintenance/rebuildtextindex.php +++ b/maintenance/rebuildtextindex.php @@ -25,7 +25,7 @@ * @todo document */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class RebuildTextIndex extends Maintenance { diff --git a/maintenance/refreshImageCount.php b/maintenance/refreshImageCount.php index f7756e316b..44794cc766 100644 --- a/maintenance/refreshImageCount.php +++ b/maintenance/refreshImageCount.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class RefreshImageCount extends Maintenance { public function __construct() { diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php index 74d07bec2f..7f1a2c152f 100644 --- a/maintenance/refreshLinks.php +++ b/maintenance/refreshLinks.php @@ -18,7 +18,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class RefreshLinks extends Maintenance { public function __construct() { diff --git a/maintenance/removeUnusedAccounts.php b/maintenance/removeUnusedAccounts.php index baa76d7d1d..642e8e04fc 100644 --- a/maintenance/removeUnusedAccounts.php +++ b/maintenance/removeUnusedAccounts.php @@ -22,7 +22,7 @@ * @author Rob Church */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class RemoveUnusedAccounts extends Maintenance { public function __construct() { diff --git a/maintenance/renameDbPrefix.php b/maintenance/renameDbPrefix.php index b7edc6eed5..d1bd1f5647 100644 --- a/maintenance/renameDbPrefix.php +++ b/maintenance/renameDbPrefix.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class RenameDbPrefix extends Maintenance { public function __construct() { diff --git a/maintenance/renamewiki.php b/maintenance/renamewiki.php index bfdca1584f..e13c876fec 100644 --- a/maintenance/renamewiki.php +++ b/maintenance/renamewiki.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class RenameWiki extends Maintenance { public function __construct() { diff --git a/maintenance/renderDump.php b/maintenance/renderDump.php index b6758f7a32..d36953f89f 100644 --- a/maintenance/renderDump.php +++ b/maintenance/renderDump.php @@ -28,7 +28,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class DumpRenderer extends Maintenance { diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php index 0816c64883..acadcf67c8 100644 --- a/maintenance/runJobs.php +++ b/maintenance/runJobs.php @@ -24,7 +24,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class RunJobs extends Maintenance { public function __construct() { diff --git a/maintenance/showJobs.php b/maintenance/showJobs.php index 8f068f511f..beff294d22 100644 --- a/maintenance/showJobs.php +++ b/maintenance/showJobs.php @@ -24,7 +24,7 @@ * @author Ashar Voultoiz */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class ShowJobs extends Maintenance { public function __construct() { diff --git a/maintenance/showStats.php b/maintenance/showStats.php index e42fab6044..dfce36135e 100644 --- a/maintenance/showStats.php +++ b/maintenance/showStats.php @@ -28,7 +28,7 @@ * @license GNU General Public License 2.0 or later */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class ShowStats extends Maintenance { public function __construct() { diff --git a/maintenance/sql.php b/maintenance/sql.php index 64ddc7af50..dda3b37d09 100644 --- a/maintenance/sql.php +++ b/maintenance/sql.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class MwSql extends Maintenance { public function __construct() { diff --git a/maintenance/stats.php b/maintenance/stats.php index 53e15a1328..e20c345a93 100644 --- a/maintenance/stats.php +++ b/maintenance/stats.php @@ -20,7 +20,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class CacheStats extends Maintenance { diff --git a/maintenance/undelete.php b/maintenance/undelete.php index 35fa64097a..b392ac95c4 100644 --- a/maintenance/undelete.php +++ b/maintenance/undelete.php @@ -6,7 +6,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class Undelete extends Maintenance { public function __construct() { diff --git a/maintenance/update.php b/maintenance/update.php index 6c52ef1bc3..c473153e19 100644 --- a/maintenance/update.php +++ b/maintenance/update.php @@ -11,7 +11,7 @@ /** */ $wgUseMasterForMaintenance = true; -require( "commandLine.inc" ); +require_once( dirname(__FILE__) . '/commandLine.inc' ); require( "updaters.inc" ); # Don't try to load stuff from l10n_cache yet diff --git a/maintenance/updateArticleCount.php b/maintenance/updateArticleCount.php index ae7e5e6ea8..51825ded2b 100644 --- a/maintenance/updateArticleCount.php +++ b/maintenance/updateArticleCount.php @@ -22,7 +22,7 @@ * @author Rob Church */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class UpdateArticleCount extends Maintenance { diff --git a/maintenance/updateRestrictions.php b/maintenance/updateRestrictions.php index 5ae0684582..7068493bb2 100644 --- a/maintenance/updateRestrictions.php +++ b/maintenance/updateRestrictions.php @@ -23,7 +23,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class UpdateRestrictions extends Maintenance { public function __construct() { diff --git a/maintenance/updateSearchIndex.php b/maintenance/updateSearchIndex.php index 978ccabed0..e804dfdfad 100644 --- a/maintenance/updateSearchIndex.php +++ b/maintenance/updateSearchIndex.php @@ -27,7 +27,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class UpdateSearchIndex extends Maintenance { diff --git a/maintenance/updateSpecialPages.php b/maintenance/updateSpecialPages.php index 298cc273a2..ff9a618dcf 100644 --- a/maintenance/updateSpecialPages.php +++ b/maintenance/updateSpecialPages.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class UpdateSpecialPages extends Maintenance { public function __construct() { diff --git a/maintenance/upgrade1_5.php b/maintenance/upgrade1_5.php index dd4acaaec6..23eb30fdc7 100644 --- a/maintenance/upgrade1_5.php +++ b/maintenance/upgrade1_5.php @@ -15,7 +15,7 @@ $options = array( 'step', 'noimages' ); -require_once( 'commandLine.inc' ); +require_once( dirname(__FILE__) . '/commandLine.inc' ); require_once( 'FiveUpgrade.inc' ); $upgrade = new FiveUpgrade(); diff --git a/maintenance/userOptions.inc b/maintenance/userOptions.inc index da641b4b5b..d660019db1 100644 --- a/maintenance/userOptions.inc +++ b/maintenance/userOptions.inc @@ -8,7 +8,7 @@ $options = array( 'list', 'nowarn', 'quiet', 'usage', 'dry' ); $optionsWithArgs = array( 'old', 'new' ); -require_once( 'commandLine.inc' ); +require_once( dirname(__FILE__) . '/commandLine.inc' ); /** * @ingroup Maintenance diff --git a/maintenance/waitForSlave.php b/maintenance/waitForSlave.php index e8c1034780..cf9bd001d0 100644 --- a/maintenance/waitForSlave.php +++ b/maintenance/waitForSlave.php @@ -19,7 +19,7 @@ * @see wfWaitForSlaves() */ -require_once( "Maintenance.php" ); +require_once( dirname(__FILE__) . '/Maintenance.php' ); class WaitForSlave extends Maintenance { public function __construct() { -- 2.20.1