http://www.mediawiki.org/wiki/Special:Code/MediaWiki/54798
Revision: 54798
Author: brion
Date: 2009-08-11 18:10:33 +0000 (Tue, 11 Aug 2009)
Log Message:
-----------
r54797 from trunk
Modified Paths:
--------------
branches/wmf-deployment/extensions/SecurePoll/cli/wm-scripts/voterList-bv2009.php
Property Changed:
----------------
branches/wmf-deployment/extensions/SecurePoll/
branches/wmf-deployment/extensions/SecurePoll/cli/testDebian.php
branches/wmf-deployment/extensions/SecurePoll/cli/wm-scripts/
branches/wmf-deployment/extensions/SecurePoll/includes/Base.php
branches/wmf-deployment/extensions/SecurePoll/resources/SecurePoll.css
branches/wmf-deployment/extensions/SecurePoll/resources/SecurePoll.js
Property changes on: branches/wmf-deployment/extensions/SecurePoll
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions/SecurePoll:51646
/trunk/extensions/SecurePoll:52089-53866,54715
/trunk/phase3/SecurePoll:52859,53272
/trunk/phase3/extensions/SecurePoll:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613
+ /branches/REL1_15/phase3/extensions/SecurePoll:51646
/trunk/extensions/SecurePoll:52089-53866,54715,54797
/trunk/phase3/SecurePoll:52859,53272
/trunk/phase3/extensions/SecurePoll:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613
Property changes on:
branches/wmf-deployment/extensions/SecurePoll/cli/testDebian.php
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/extensions/BoardVote/cli/testDebian.php:6303-48670
/trunk/extensions/SecurePoll/cli/testDebian.php:54715
+ /trunk/extensions/BoardVote/cli/testDebian.php:6303-48670
/trunk/extensions/SecurePoll/cli/testDebian.php:54715,54797
Property changes on:
branches/wmf-deployment/extensions/SecurePoll/cli/wm-scripts
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions/SecurePoll/cli/wm-scripts:51646
/trunk/extensions/SecurePoll/cli/wm-scripts:52089-53866,54105,54715
/trunk/phase3/SecurePoll/cli/wm-scripts:52859,53272
/trunk/phase3/extensions/SecurePoll/cli/wm-scripts:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613
+ /branches/REL1_15/phase3/extensions/SecurePoll/cli/wm-scripts:51646
/trunk/extensions/SecurePoll/cli/wm-scripts:52089-53866,54105,54715,54797
/trunk/phase3/SecurePoll/cli/wm-scripts:52859,53272
/trunk/phase3/extensions/SecurePoll/cli/wm-scripts:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613
Modified:
branches/wmf-deployment/extensions/SecurePoll/cli/wm-scripts/voterList-bv2009.php
===================================================================
---
branches/wmf-deployment/extensions/SecurePoll/cli/wm-scripts/voterList-bv2009.php
2009-08-11 18:08:33 UTC (rev 54797)
+++
branches/wmf-deployment/extensions/SecurePoll/cli/wm-scripts/voterList-bv2009.php
2009-08-11 18:10:33 UTC (rev 54798)
@@ -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 ) {
Property changes on:
branches/wmf-deployment/extensions/SecurePoll/includes/Base.php
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/extensions/BoardVote/includes/Base.php:6303-48670
/trunk/extensions/SecurePoll/includes/Base.php:53858-53866,54715
+ /trunk/extensions/BoardVote/includes/Base.php:6303-48670
/trunk/extensions/SecurePoll/includes/Base.php:53858-53866,54715,54797
Property changes on:
branches/wmf-deployment/extensions/SecurePoll/resources/SecurePoll.css
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/extensions/BoardVote/resources/SecurePoll.css:6303-48670
/trunk/extensions/SecurePoll/resources/SecurePoll.css:53858-53866,54715
+ /trunk/extensions/BoardVote/resources/SecurePoll.css:6303-48670
/trunk/extensions/SecurePoll/resources/SecurePoll.css:53858-53866,54715,54797
Property changes on:
branches/wmf-deployment/extensions/SecurePoll/resources/SecurePoll.js
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/extensions/BoardVote/resources/SecurePoll.js:6303-48670
/trunk/extensions/SecurePoll/resources/SecurePoll.js:53858-53866,54715
+ /trunk/extensions/BoardVote/resources/SecurePoll.js:6303-48670
/trunk/extensions/SecurePoll/resources/SecurePoll.js:53858-53866,54715,54797
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
