Revert r54244 which was stupid and fix this properly. Require commandLine.inc/Mainten...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b47c679..607af0e 100644 (file)
--- 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 57513dc..787414c 100644 (file)
--- 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 71d5c79..fa07649 100644 (file)
--- 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 ee5af78..d167cf9 100644 (file)
--- 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 b980541..b6f23c4 100644 (file)
--- 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 10ed826..69043b2 100644 (file)
--- 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 90ef996..9c8f29e 100644 (file)
--- 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 87ecaae..32f04f4 100644 (file)
--- 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 71743dc..5dcaac2 100644 (file)
--- 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 7b7f11f..e1754d3 100644 (file)
--- 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 46ca18d..17fddef 100644 (file)
--- 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 00903f2..a173078 100644 (file)
--- 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 78f117c..7da4a24 100644 (file)
--- 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 4d76ac7..71591f4 100644 (file)
--- 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 bfc3a1e..89d7aee 100644 (file)
--- 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 ad0e0d0..8f6c2eb 100644 (file)
--- 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 1c5eaae..6a6a498 100644 (file)
--- 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 32a483e..415662a 100644 (file)
--- 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 0f018b4..1d58919 100644 (file)
--- 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 0a18596..694f999 100644 (file)
--- a/maintenance/createAndPromote.php
+++ b/maintenance/createAndPromote.php
@@ -22,7 +22,7 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-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 171d5d4..678af5e 100644 (file)
--- 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 98e4aff..c3f8bf1 100644 (file)
--- 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 0d6dac9..6aecda7 100644 (file)
--- 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 305eb41..65216c1 100644 (file)
--- 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 73712d1..d33c9af 100644 (file)
--- 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 7084751..05d8532 100644 (file)
--- a/maintenance/deleteOldRevisions.php
+++ b/maintenance/deleteOldRevisions.php
@@ -22,7 +22,7 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-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 79e9e63..603408c 100644 (file)
--- 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 cb84085..dd8bf13 100644 (file)
--- 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 40d9b56..3f4530e 100644 (file)
--- 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 16bf4db..c4f44ac 100644 (file)
--- 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 83ee665..1cb70d0 100644 (file)
--- 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 5b397b7..9e8f637 100644 (file)
--- 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 3d75131..38420ee 100644 (file)
--- 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 ec549e6..c8f1667 100644 (file)
--- 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 8a7cd46..d736090 100644 (file)
--- 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 b1b1308..c25c8d6 100644 (file)
--- 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 76e0dd1..746ef8a 100644 (file)
--- 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 c10e113..da50b2e 100644 (file)
--- 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 71492eb..57999a5 100644 (file)
--- 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 c9589f5..8d89e09 100644 (file)
--- 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 15c00b3..46c9fae 100644 (file)
--- 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 da1680b..e310ee0 100644 (file)
--- 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 7ac197b..a2cad76 100644 (file)
--- 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 9c9f6b1..bc14ae7 100644 (file)
--- 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 f164ec3..eac97a5 100644 (file)
--- 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 cb56297..40c24aa 100644 (file)
--- 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<<<EOT

diff --git a/maintenance/importDump.php b/maintenance/importDump.php
index eb51126..3458c85 100644 (file)
--- a/maintenance/importDump.php
+++ b/maintenance/importDump.php
@@ -24,7 +24,7 @@
 
 $optionsWithArgs = array( 'report' );
 
-require_once( 'commandLine.inc' );
+require_once( dirname(__FILE__) . '/commandLine.inc' );
 
 /**
  * @ingroup Maintenance

diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index 5efd1fc..38595dd 100644 (file)
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -10,7 +10,7 @@
  */
 
 $optionsWithArgs = array( 'extensions', 'comment', 'comment-file', 'comment-ext', 'user', 'license' );
-require_once( 'commandLine.inc' );
+require_once( dirname(__FILE__) . '/commandLine.inc' );
 require_once( 'importImages.inc' );
 $added = $skipped = $overwritten = 0;
 

diff --git a/maintenance/importTextFile.php b/maintenance/importTextFile.php
index bfb852e..9a6500f 100644 (file)
--- a/maintenance/importTextFile.php
+++ b/maintenance/importTextFile.php
@@ -11,7 +11,7 @@
 
 $options = array( 'help', 'nooverwrite', 'norc' );
 $optionsWithArgs = array( 'title', 'user', 'comment' );
-require_once( 'commandLine.inc' );
+require_once( dirname(__FILE__) . '/commandLine.inc' );
 echo( "Import Text File\n\n" );
 
 if( count( $args ) < 1 || isset( $options['help'] ) ) {

diff --git a/maintenance/initEditCount.php b/maintenance/initEditCount.php
index c8bc586..f2bbb49 100644 (file)
--- a/maintenance/initEditCount.php
+++ b/maintenance/initEditCount.php
@@ -18,7 +18,7 @@
  * @ingroup Maintenance
  */
 
-require_once( "Maintenance.php" );
+require_once( dirname(__FILE__) . '/Maintenance.php' );
 
 class InitEditCount extends Maintenance {
        public function __construct() {

diff --git a/maintenance/initStats.php b/maintenance/initStats.php
index ce46284..b92d46c 100644 (file)
--- a/maintenance/initStats.php
+++ b/maintenance/initStats.php
@@ -24,7 +24,7 @@
  * @licence GNU General Public Licence 2.0 or later
  */
 
-require_once( "Maintenance.php" );
+require_once( dirname(__FILE__) . '/Maintenance.php' );
 
 class InitStats extends Maintenance {
        public function __construct() {

diff --git a/maintenance/installExtension.php b/maintenance/installExtension.php
index d5c4f4b..ea4c191 100644 (file)
--- a/maintenance/installExtension.php
+++ b/maintenance/installExtension.php
@@ -23,7 +23,7 @@
 
 $optionsWithArgs = array( 'target', 'repository', 'repos' );
 
-require_once( 'commandLine.inc' );
+require_once( dirname(__FILE__) . '/commandLine.inc' );
 
 define('EXTINST_NOPATCH', 0);
 define('EXTINST_WRITEPATCH', 6);

diff --git a/maintenance/mcc.php b/maintenance/mcc.php
index 53645df..3fa7d77 100644 (file)
--- a/maintenance/mcc.php
+++ b/maintenance/mcc.php
@@ -8,7 +8,7 @@
  */
 
 /** */
-require_once( 'commandLine.inc' );
+require_once( dirname(__FILE__) . '/commandLine.inc' );
 
 $mcc = new memcached( array('persistant' => true/*, 'debug' => true*/) );
 $mcc->set_servers( $wgMemCachedServers );

diff --git a/maintenance/mctest.php b/maintenance/mctest.php
index 63bc3dd..b77ffcb 100644 (file)
--- 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 5f0e3d6..878b649 100644 (file)
--- 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 fac1291..5b010e8 100644 (file)
--- 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 c0a8b59..10528d4 100644 (file)
--- 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 08232d2..b184938 100644 (file)
--- 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 eb8f166..cb0d3aa 100644 (file)
--- a/maintenance/nukePage.php
+++ b/maintenance/nukePage.php
@@ -22,7 +22,7 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-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 6e68a82..cbcf228 100644 (file)
--- 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 926e19e..16307ba 100644 (file)
--- 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 0629b33..8fbe58a 100644 (file)
--- 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 af9f219..bf84bb0 100644 (file)
--- 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 4d24754..0e53e1e 100644 (file)
--- 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 359ee95..ff5b1fc 100644 (file)
--- 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 8114b9d..bf81cb6 100644 (file)
--- 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 0569730..008a4b4 100644 (file)
--- 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 6606746..126707a 100644 (file)
--- 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 a267171..7168a20 100644 (file)
--- 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 9e078b8..9621cb3 100644 (file)
--- a/maintenance/purgeOldText.php
+++ b/maintenance/purgeOldText.php
@@ -21,7 +21,7 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-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 714d243..926ee5c 100644 (file)
--- 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 7cfd3fa..7b3be7d 100644 (file)
--- 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 46b5d0e..d4515ff 100644 (file)
--- 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 8a25ce3..93b4f5e 100644 (file)
--- 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 1e7a747..a08efca 100644 (file)
--- 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 4d743e6..a27eca6 100644 (file)
--- 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 2afbc3f..546d521 100644 (file)
--- 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 13e5705..54cdbcc 100644 (file)
--- 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 17b261f..64b80aa 100644 (file)
--- 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 f7756e3..44794cc 100644 (file)
--- 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 74d07be..7f1a2c1 100644 (file)
--- 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 baa76d7..642e8e0 100644 (file)
--- a/maintenance/removeUnusedAccounts.php
+++ b/maintenance/removeUnusedAccounts.php
@@ -22,7 +22,7 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-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 b7edc6e..d1bd1f5 100644 (file)
--- 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 bfdca15..e13c876 100644 (file)
--- 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 b6758f7..d36953f 100644 (file)
--- 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 0816c64..acadcf6 100644 (file)
--- 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 8f068f5..beff294 100644 (file)
--- 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 e42fab6..dfce361 100644 (file)
--- 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 64ddc7a..dda3b37 100644 (file)
--- 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 53e15a1..e20c345 100644 (file)
--- 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 35fa640..b392ac9 100644 (file)
--- 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 6c52ef1..c473153 100644 (file)
--- 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 ae7e5e6..51825de 100644 (file)
--- a/maintenance/updateArticleCount.php
+++ b/maintenance/updateArticleCount.php
@@ -22,7 +22,7 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-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 5ae0684..7068493 100644 (file)
--- 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 978ccab..e804dfd 100644 (file)
--- 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 298cc27..ff9a618 100644 (file)
--- 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 dd4acaa..23eb30f 100644 (file)
--- 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 da641b4..d660019 100644 (file)
--- 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 e8c1034..cf9bd00 100644 (file)
--- 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() {