http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90756
Revision: 90756
Author: aaron
Date: 2011-06-25 05:05:26 +0000 (Sat, 25 Jun 2011)
Log Message:
-----------
(bug 25390) autoreview privilege should be removeable like editor (uses r90749)
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/FlaggedRevs.php
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevs.php 2011-06-25 04:58:48 UTC
(rev 90755)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.php 2011-06-25 05:05:26 UTC
(rev 90756)
@@ -567,27 +567,28 @@
$wgUseRCPatrol = true;
}
}
- global $wgFlaggedRevsAutoconfirm, $wgAutopromote;
- # $wgFlaggedRevsAutoconfirm is now a wrapper around $wgAutopromote
- if ( is_array( $wgFlaggedRevsAutoconfirm ) ) {
- $wgAutopromote['autoreview'] = array( '&', // AND
- array( APCOND_AGE,
$wgFlaggedRevsAutoconfirm['days']*86400 ),
- array( APCOND_EDITCOUNT,
$wgFlaggedRevsAutoconfirm['edits'] ),
- array( APCOND_FR_EDITSUMMARYCOUNT,
$wgFlaggedRevsAutoconfirm['editComments'] ),
- array( APCOND_FR_UNIQUEPAGECOUNT,
$wgFlaggedRevsAutoconfirm['uniqueContentPages'] ),
- array( APCOND_FR_EDITSPACING,
- $wgFlaggedRevsAutoconfirm['spacing'],
$wgFlaggedRevsAutoconfirm['benchmarks'] ),
+ global $wgFlaggedRevsAutoconfirm, $wgAutopromoteOnce;
+ # $wgFlaggedRevsAutoconfirm is now a wrapper around $wgAutopromoteOnce
+ $req = $wgFlaggedRevsAutoconfirm; // convenience
+ if ( is_array( $req ) ) {
+ $criteria = array( '&', // AND
+ array( APCOND_AGE, $req['days']*86400 ),
+ array( APCOND_EDITCOUNT, $req['edits'] ),
+ array( APCOND_FR_EDITSUMMARYCOUNT, $req['editComments']
),
+ array( APCOND_FR_UNIQUEPAGECOUNT,
$req['uniqueContentPages'] ),
+ array( APCOND_FR_EDITSPACING, $req['spacing'],
$req['benchmarks'] ),
array( '|', // OR
- array( APCOND_FR_CONTENTEDITCOUNT,
$wgFlaggedRevsAutoconfirm['totalContentEdits'] ),
- array( APCOND_FR_CHECKEDEDITCOUNT,
$wgFlaggedRevsAutoconfirm['totalCheckedEdits'] )
+ array( APCOND_FR_CONTENTEDITCOUNT,
$req['totalContentEdits'] ),
+ array( APCOND_FR_CHECKEDEDITCOUNT,
$req['totalCheckedEdits'] )
)
);
- if ( $wgFlaggedRevsAutoconfirm['email'] ) {
- $wgAutopromote['autoreview'][] = array(
APCOND_EMAILCONFIRMED );
+ if ( $req['email'] ) {
+ $criteria[] = array( APCOND_EMAILCONFIRMED );
}
- if ( $wgFlaggedRevsAutoconfirm['neverBlocked'] ) {
- $wgAutopromote['autoreview'][] = array(
APCOND_FR_NEVERBOCKED );
+ if ( $req['neverBlocked'] ) {
+ $criteria[] = array( APCOND_FR_NEVERBOCKED );
}
+ $wgAutopromoteOnce['onEdit']['autoreview'] = $criteria;
}
# Conditional API modules
efSetFlaggedRevsConditionalAPIModules();
@@ -612,7 +613,7 @@
}
function efSetFlaggedRevsConditionalRights() {
- global $wgGroupPermissions, $wgImplicitGroups,
$wgFlaggedRevsAutoconfirm;
+ global $wgGroupPermissions, $wgFlaggedRevsAutoconfirm;
if ( FlaggedRevs::useOnlyIfProtected() ) {
// Removes sp:ListGroupRights cruft
if ( isset( $wgGroupPermissions['editor'] ) ) {
@@ -625,8 +626,6 @@
if ( !empty( $wgFlaggedRevsAutoconfirm ) ) {
# Implicit autoreview group
$wgGroupPermissions['autoreview']['autoreview'] = true;
- # Don't show the 'autoreview' group everywhere
- $wgImplicitGroups[] = 'autoreview';
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
