Reedy has submitted this change and it was merged.
Change subject: Update inclusion of commandLine.inc
......................................................................
Update inclusion of commandLine.inc
Change-Id: I5bfb2498843f17fca044929349313d2c33efe677
---
M cli/wm-scripts/elections-2011-spam/buildSpamTranslations.php
M cli/wm-scripts/elections-2011-spam/doSpam.php
M cli/wm-scripts/elections-2011-spam/sendMails.php
3 files changed, 16 insertions(+), 3 deletions(-)
Approvals:
Reedy: Verified; Looks good to me, approved
diff --git a/cli/wm-scripts/elections-2011-spam/buildSpamTranslations.php
b/cli/wm-scripts/elections-2011-spam/buildSpamTranslations.php
index 9c22a12..cd69bc6 100644
--- a/cli/wm-scripts/elections-2011-spam/buildSpamTranslations.php
+++ b/cli/wm-scripts/elections-2011-spam/buildSpamTranslations.php
@@ -1,6 +1,10 @@
<?php
-require( "/a/common/php/maintenance/commandLine.inc" );
+$IP = getenv( 'MW_INSTALL_PATH' );
+if ( $IP === false ) {
+ $IP = dirname( __FILE__ ) . '/../../../../..';
+}
+require_once( "$IP/maintenance/commandLine.inc" );
$wgDebugLogFile = '/dev/stderr';
diff --git a/cli/wm-scripts/elections-2011-spam/doSpam.php
b/cli/wm-scripts/elections-2011-spam/doSpam.php
index 3edbbbd..1f84028 100644
--- a/cli/wm-scripts/elections-2011-spam/doSpam.php
+++ b/cli/wm-scripts/elections-2011-spam/doSpam.php
@@ -1,6 +1,10 @@
<?php
-require( '/a/common/php/maintenance/commandLine.inc' );
+$IP = getenv( 'MW_INSTALL_PATH' );
+if ( $IP === false ) {
+ $IP = dirname( __FILE__ ) . '/../../../../..';
+}
+require_once( "$IP/maintenance/commandLine.inc" );
ini_set( 'display_errors', 1 );
diff --git a/cli/wm-scripts/elections-2011-spam/sendMails.php
b/cli/wm-scripts/elections-2011-spam/sendMails.php
index 2adba1b..f087a9a 100644
--- a/cli/wm-scripts/elections-2011-spam/sendMails.php
+++ b/cli/wm-scripts/elections-2011-spam/sendMails.php
@@ -1,6 +1,11 @@
<?php
-require( '/a/common/php/maintenance/commandLine.inc' );
+$IP = getenv( 'MW_INSTALL_PATH' );
+if ( $IP === false ) {
+ $IP = dirname( __FILE__ ) . '/../../../../..';
+}
+require_once( "$IP/maintenance/commandLine.inc" );
+
ini_set( 'display_errors', 1 );
$err = fopen( 'php://stderr', 'w' );
$in = fopen( 'php://stdin', 'r' );
--
To view, visit https://gerrit.wikimedia.org/r/68734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5bfb2498843f17fca044929349313d2c33efe677
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
