r104365 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r104364‎ | r104365 | r104366 >
Date:21:16, 27 November 2011
Author:reedy
Status:ok
Tags:
Comment:
MFT r104360
Modified paths:
  • /branches/wmf/1.18wmf1/extensions/SecurePoll (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/SecurePoll/includes/entities/Election.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.18wmf1/extensions/SecurePoll/includes/entities/Election.php
——@@ -192,7 +192,7 @@
193193 $notCentrallyBlocked = $this->getProperty( 'not-centrally-blocked' );
194194 $centralBlockCount = isset( $props['central-block-count'] ) ? $props['central-block-count'] : 0;
195195 $centralBlockThreshold = $this->getProperty( 'central-block-threshold', 1 );
196 - if ( $centralBlockCount >= $centralBlockThreshold ) {
 196+ if ( $notCentrallyBlocked && $centralBlockCount >= $centralBlockThreshold ) {
197197 $status->fatal( 'securepoll-blocked-centrally', $wgLang->formatNum( $centralBlockThreshold ) );
198198 }
199199
Property changes on: branches/wmf/1.18wmf1/extensions/SecurePoll
___________________________________________________________________
Added: svn:mergeinfo
200200 Merged /branches/sqlite/extensions/SecurePoll:r58211-58321
201201 Merged /trunk/phase3/extensions/SecurePoll:r92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,98578,98598,98656
202202 Merged /branches/new-installer/phase3/extensions/SecurePoll:r43664-66004
203203 Merged /branches/REL1_15/phase3/extensions/SecurePoll:r51646
204204 Merged /branches/REL1_18/extensions/SecurePoll:r101758,103190
205205 Merged /branches/REL1_17/phase3/extensions/SecurePoll:r81445,81448
206206 Merged /trunk/extensions/SecurePoll:r99592,99653,100092,100419,100686,100692,100699,103669,104360

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r104360Follow-up r89020 - the election option to enable checking for blocks on other...happy-melon20:10, 27 November 2011

Status & tagging log