Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/66258
Change subject: Fix path to cli fail
......................................................................
Fix path to cli fail
Change-Id: I1b63f7025dab60b40b0fc719528a36c1a8f64878
---
M cli/wm-scripts/arbcom/makeArbcomList.php
M cli/wm-scripts/bv2009/dumpMetaTranslations.php
M cli/wm-scripts/bv2009/populateBv2009EditCount.php
M cli/wm-scripts/bv2009/voterList-bv2009.php
M cli/wm-scripts/bv2013/dumpMetaTranslations.php
M cli/wm-scripts/bv2013/populateEditCount.php
M cli/wm-scripts/bv2013/voterList.php
7 files changed, 29 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecurePoll
refs/changes/58/66258/1
diff --git a/cli/wm-scripts/arbcom/makeArbcomList.php
b/cli/wm-scripts/arbcom/makeArbcomList.php
index 22d3eba..738e191 100644
--- a/cli/wm-scripts/arbcom/makeArbcomList.php
+++ b/cli/wm-scripts/arbcom/makeArbcomList.php
@@ -5,7 +5,7 @@
*/
$optionsWithArgs = array( 'before', 'edits' );
-require( dirname(__FILE__).'/../cli.inc' );
+require( dirname(__FILE__).'/../../cli.inc' );
$dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
diff --git a/cli/wm-scripts/bv2009/dumpMetaTranslations.php
b/cli/wm-scripts/bv2009/dumpMetaTranslations.php
index f6ad0f2..7e665ba 100644
--- a/cli/wm-scripts/bv2009/dumpMetaTranslations.php
+++ b/cli/wm-scripts/bv2009/dumpMetaTranslations.php
@@ -1,6 +1,6 @@
<?php
-require( dirname( __FILE__ ) . '/../cli.inc' );
+require( dirname( __FILE__ ) . '/../../cli.inc' );
$spConf = array(
'numCandidates' => 18,
diff --git a/cli/wm-scripts/bv2009/populateBv2009EditCount.php
b/cli/wm-scripts/bv2009/populateBv2009EditCount.php
index 6546b88..fa691f2 100644
--- a/cli/wm-scripts/bv2009/populateBv2009EditCount.php
+++ b/cli/wm-scripts/bv2009/populateBv2009EditCount.php
@@ -5,7 +5,7 @@
* have made at least 50 edits between 01 January and 01 July 2009.
*/
-require( dirname(__FILE__) . '/../cli.inc' );
+require( dirname(__FILE__) . '/../../cli.inc' );
$dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
diff --git a/cli/wm-scripts/bv2009/voterList-bv2009.php
b/cli/wm-scripts/bv2009/voterList-bv2009.php
index a39417c..e2eb247 100644
--- a/cli/wm-scripts/bv2009/voterList-bv2009.php
+++ b/cli/wm-scripts/bv2009/voterList-bv2009.php
@@ -1,6 +1,6 @@
<?php
-require( dirname( __FILE__ ) . '/../cli.inc' );
+require( dirname( __FILE__ ) . '/../../cli.inc' );
$dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
$fname = 'voterList-bv2009.php';
diff --git a/cli/wm-scripts/bv2013/dumpMetaTranslations.php
b/cli/wm-scripts/bv2013/dumpMetaTranslations.php
index 01e0753..946ff82 100644
--- a/cli/wm-scripts/bv2013/dumpMetaTranslations.php
+++ b/cli/wm-scripts/bv2013/dumpMetaTranslations.php
@@ -1,6 +1,6 @@
<?php
-require( dirname( __FILE__ ) . '/../cli.inc' );
+require( dirname( __FILE__ ) . '/../../cli.inc' );
$spConf = array(
'numCandidates' => 18,
@@ -52,7 +52,7 @@
<SecurePoll>
<election>
<configuration>
-<title>Wikimedia Board of Trustees Election, 2009</title>
+<title>Wikimedia Board of Trustees Election, 2013</title>
<ballot>preferential</ballot>
<tally>schulze</tally>
<primaryLang>en</primaryLang>
@@ -106,6 +106,10 @@
exit( 0 );
//------------------------------------------------------------------
+/**
+ * @param $lang string
+ * @return array|bool
+ */
function spGetMetaTranslations( $lang ) {
global $spConf, $wgParser;
$messages = array();
@@ -180,20 +184,25 @@
return $messages;
}
+/**
+ * @param $messages array
+ * @param $entity
+ * @return string
+ */
function spFormatEntityMessages( $messages, $entity ) {
$s = '';
$targetEntity = $entity;
foreach ( $messages as $lang => $langMsgs ) {
foreach ( $langMsgs as $entity => $entityMsgs ) {
if ( $entity === $targetEntity ) {
- foreach ( $entityMsgs as $key => $value ) {
- $s .= Xml::element(
- 'message',
- array( 'name' => $key,
'lang' => $lang ),
- $value
- ) .
- "\n";
- }
+ continue;
+ }
+ foreach ( $entityMsgs as $key => $value ) {
+ $s .= Xml::element(
+ 'message',
+ array( 'name' => $key, 'lang'
=> $lang ),
+ $value
+ ) . "\n";
}
}
}
diff --git a/cli/wm-scripts/bv2013/populateEditCount.php
b/cli/wm-scripts/bv2013/populateEditCount.php
index 7bd5abd..f1a74cb 100644
--- a/cli/wm-scripts/bv2013/populateEditCount.php
+++ b/cli/wm-scripts/bv2013/populateEditCount.php
@@ -6,7 +6,7 @@
* have made at least 20 edits between 15 December 2012 and 30 April 2013.
*/
-require( dirname(__FILE__) . '/../cli.inc' );
+require( dirname(__FILE__) . '/../../cli.inc' );
$dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
diff --git a/cli/wm-scripts/bv2013/voterList.php
b/cli/wm-scripts/bv2013/voterList.php
index 4b0112f..92a3eef 100644
--- a/cli/wm-scripts/bv2013/voterList.php
+++ b/cli/wm-scripts/bv2013/voterList.php
@@ -1,6 +1,6 @@
<?php
-require( dirname( __FILE__ ) . '/../cli.inc' );
+require( dirname( __FILE__ ) . '/../../cli.inc' );
$dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
$fname = 'voterList.php';
@@ -44,6 +44,10 @@
}
echo wfWikiID() . " qualified \t$numQualified\n";
+/**
+ * @param $users array
+ * @return array
+ */
function spGetQualifiedUsers( $users ) {
global $wgCentralAuthDatabase, $wgLocalDatabases;
$dbc = wfGetDB( DB_SLAVE, array(), $wgCentralAuthDatabase );
--
To view, visit https://gerrit.wikimedia.org/r/66258
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b63f7025dab60b40b0fc719528a36c1a8f64878
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
