http://www.mediawiki.org/wiki/Special:Code/MediaWiki/54797
Revision: 54797
Author: brion
Date: 2009-08-11 18:08:33 +0000 (Tue, 11 Aug 2009)
Log Message:
-----------
Committing Tim's live hack to fix counts
Modified Paths:
--------------
trunk/extensions/SecurePoll/cli/wm-scripts/voterList-bv2009.php
Modified: trunk/extensions/SecurePoll/cli/wm-scripts/voterList-bv2009.php
===================================================================
--- trunk/extensions/SecurePoll/cli/wm-scripts/voterList-bv2009.php
2009-08-11 18:08:12 UTC (rev 54796)
+++ trunk/extensions/SecurePoll/cli/wm-scripts/voterList-bv2009.php
2009-08-11 18:08:33 UTC (rev 54797)
@@ -4,13 +4,14 @@
$dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
$fname = 'voterList-bv2009.php';
+$listName = 'board-vote-2009-amended';
if ( !$wgCentralAuthDatabase ) {
echo wfWikiID() . ": CentralAuth not active, skipping\n";
exit( 0 );
}
-$dbw->delete( 'securepoll_lists', array( 'li_name' => 'board-vote-2009' ),
$fname );
+$dbw->delete( 'securepoll_lists', array( 'li_name' => $listName ), $fname );
$userId = 0;
$numQualified = 0;
@@ -32,7 +33,7 @@
$insertBatch = array();
foreach ( $qualifieds as $id => $name ) {
$insertBatch[] = array(
- 'li_name' => 'board-vote-2009',
+ 'li_name' => $listName,
'li_member' => $id
);
}
@@ -74,6 +75,7 @@
$attached = array_diff( $attached, $nonLocalUsers );
# Check all global accounts
+ $localWiki = wfWikiID();
if ( $attached ) {
$res = $dbc->select( 'localuser',
array( 'lu_name', 'lu_wiki' ),
@@ -81,7 +83,9 @@
__METHOD__ );
$foreignUsers = array();
foreach ( $res as $row ) {
- $foreignUsers[$row->lu_wiki][] = $row->lu_name;
+ if ( $row->lu_wiki != $localWiki ) {
+ $foreignUsers[$row->lu_wiki][] = $row->lu_name;
+ }
}
foreach ( $foreignUsers as $wiki => $wikiUsers ) {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
