| Index: trunk/extensions/FlaggedRevs/FlaggedRevs.php |
| — | — | @@ -567,27 +567,28 @@ |
| 568 | 568 | $wgUseRCPatrol = true; |
| 569 | 569 | } |
| 570 | 570 | } |
| 571 | | - global $wgFlaggedRevsAutoconfirm, $wgAutopromote; |
| 572 | | - # $wgFlaggedRevsAutoconfirm is now a wrapper around $wgAutopromote |
| 573 | | - if ( is_array( $wgFlaggedRevsAutoconfirm ) ) { |
| 574 | | - $wgAutopromote['autoreview'] = array( '&', // AND |
| 575 | | - array( APCOND_AGE, $wgFlaggedRevsAutoconfirm['days']*86400 ), |
| 576 | | - array( APCOND_EDITCOUNT, $wgFlaggedRevsAutoconfirm['edits'] ), |
| 577 | | - array( APCOND_FR_EDITSUMMARYCOUNT, $wgFlaggedRevsAutoconfirm['editComments'] ), |
| 578 | | - array( APCOND_FR_UNIQUEPAGECOUNT, $wgFlaggedRevsAutoconfirm['uniqueContentPages'] ), |
| 579 | | - array( APCOND_FR_EDITSPACING, |
| 580 | | - $wgFlaggedRevsAutoconfirm['spacing'], $wgFlaggedRevsAutoconfirm['benchmarks'] ), |
| | 571 | + global $wgFlaggedRevsAutoconfirm, $wgAutopromoteOnce; |
| | 572 | + # $wgFlaggedRevsAutoconfirm is now a wrapper around $wgAutopromoteOnce |
| | 573 | + $req = $wgFlaggedRevsAutoconfirm; // convenience |
| | 574 | + if ( is_array( $req ) ) { |
| | 575 | + $criteria = array( '&', // AND |
| | 576 | + array( APCOND_AGE, $req['days']*86400 ), |
| | 577 | + array( APCOND_EDITCOUNT, $req['edits'] ), |
| | 578 | + array( APCOND_FR_EDITSUMMARYCOUNT, $req['editComments'] ), |
| | 579 | + array( APCOND_FR_UNIQUEPAGECOUNT, $req['uniqueContentPages'] ), |
| | 580 | + array( APCOND_FR_EDITSPACING, $req['spacing'], $req['benchmarks'] ), |
| 581 | 581 | array( '|', // OR |
| 582 | | - array( APCOND_FR_CONTENTEDITCOUNT, $wgFlaggedRevsAutoconfirm['totalContentEdits'] ), |
| 583 | | - array( APCOND_FR_CHECKEDEDITCOUNT, $wgFlaggedRevsAutoconfirm['totalCheckedEdits'] ) |
| | 582 | + array( APCOND_FR_CONTENTEDITCOUNT, $req['totalContentEdits'] ), |
| | 583 | + array( APCOND_FR_CHECKEDEDITCOUNT, $req['totalCheckedEdits'] ) |
| 584 | 584 | ) |
| 585 | 585 | ); |
| 586 | | - if ( $wgFlaggedRevsAutoconfirm['email'] ) { |
| 587 | | - $wgAutopromote['autoreview'][] = array( APCOND_EMAILCONFIRMED ); |
| | 586 | + if ( $req['email'] ) { |
| | 587 | + $criteria[] = array( APCOND_EMAILCONFIRMED ); |
| 588 | 588 | } |
| 589 | | - if ( $wgFlaggedRevsAutoconfirm['neverBlocked'] ) { |
| 590 | | - $wgAutopromote['autoreview'][] = array( APCOND_FR_NEVERBOCKED ); |
| | 589 | + if ( $req['neverBlocked'] ) { |
| | 590 | + $criteria[] = array( APCOND_FR_NEVERBOCKED ); |
| 591 | 591 | } |
| | 592 | + $wgAutopromoteOnce['onEdit']['autoreview'] = $criteria; |
| 592 | 593 | } |
| 593 | 594 | # Conditional API modules |
| 594 | 595 | efSetFlaggedRevsConditionalAPIModules(); |
| — | — | @@ -612,7 +613,7 @@ |
| 613 | 614 | } |
| 614 | 615 | |
| 615 | 616 | function efSetFlaggedRevsConditionalRights() { |
| 616 | | - global $wgGroupPermissions, $wgImplicitGroups, $wgFlaggedRevsAutoconfirm; |
| | 617 | + global $wgGroupPermissions, $wgFlaggedRevsAutoconfirm; |
| 617 | 618 | if ( FlaggedRevs::useOnlyIfProtected() ) { |
| 618 | 619 | // Removes sp:ListGroupRights cruft |
| 619 | 620 | if ( isset( $wgGroupPermissions['editor'] ) ) { |
| — | — | @@ -625,8 +626,6 @@ |
| 626 | 627 | if ( !empty( $wgFlaggedRevsAutoconfirm ) ) { |
| 627 | 628 | # Implicit autoreview group |
| 628 | 629 | $wgGroupPermissions['autoreview']['autoreview'] = true; |
| 629 | | - # Don't show the 'autoreview' group everywhere |
| 630 | | - $wgImplicitGroups[] = 'autoreview'; |
| 631 | 630 | } |
| 632 | 631 | } |
| 633 | 632 | |