Revision: 46188
Author: aaron
Date: 2009-01-25 05:56:16 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
Convert totalcheckededits/totalreviewededits into an alternate condition for
totalContentEdits for greater flexibility when these get used.
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php
trunk/extensions/FlaggedRevs/FlaggedRevs.php
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php 2009-01-25 05:54:49 UTC
(rev 46187)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php 2009-01-25 05:56:16 UTC
(rev 46188)
@@ -863,15 +863,15 @@
FlaggedRevs::saveUserParams( $user->getId(), $p );
}
# Check if user edited enough content pages
+ $totalCheckedEditsNeeded = false;
if( $wgFlaggedRevsAutopromote['totalContentEdits'] >
$p['totalContentEdits'] ) {
- wfProfileOut( __METHOD__ );
- return true;
+ # Check if the user has enough sighted edits
+ if( $wgFlaggedRevsAutopromote['totalReviewedEdits'] >
$p['reviewedEdits'] ) {
+ wfProfileOut( __METHOD__ );
+ return true;
+ }
+ $totalCheckedEditsNeeded = true;
}
- # Check if the user has enough sighted edits
- if( $wgFlaggedRevsAutopromote['totalReviewedEdits'] >
$p['reviewedEdits'] ) {
- wfProfileOut( __METHOD__ );
- return true;
- }
# Check if user edited enough unique pages
if( $wgFlaggedRevsAutopromote['uniqueContentPages'] >
count($pages) ) {
wfProfileOut( __METHOD__ );
@@ -1043,7 +1043,7 @@
}
}
# Check implicitly sighted edits
- if( $wgFlaggedRevsAutopromote['totalCheckedEdits'] ) {
+ if( $totalCheckedEditsNeeded &&
$wgFlaggedRevsAutopromote['totalCheckedEdits'] ) {
$dbr = isset($dbr) ? $dbr : wfGetDB( DB_SLAVE );
$res = $dbr->select( array('revision','flaggedpages'),
'1',
array( 'rev_user' => $user->getID(),
'fp_page_id = rev_page', 'fp_stable >= rev_id' ),
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevs.php 2009-01-25 05:54:49 UTC
(rev 46187)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.php 2009-01-25 05:56:16 UTC
(rev 46188)
@@ -203,9 +203,10 @@
'spacing' => 3, # spacing of edit intervals
'benchmarks' => 15, # how many edit intervals are needed?
'recentContentEdits' => 5, # $wgContentNamespaces edits in recent
changes
- 'totalContentEdits' => 300, # $wgContentNamespaces edits
- 'totalReviewedEdits' => 0, # Edits that were specifically sighted
- 'totalCheckedEdits' => 0, # Edits before the stable version of pages
+ // Either totalContentEdits reqs OR
totalCheckedEdits/totalReviewedEdits requirements needed
+ 'totalContentEdits' => 300, # $wgContentNamespaces edits OR...
+ 'totalCheckedEdits' => 0, # ...Edits before the stable version of
pages AND...
+ 'totalReviewedEdits' => 0, # ...Edits that were specifically sighted
'uniqueContentPages' => 12, # $wgContentNamespaces unique pages edited
'editComments' => 50, # how many edit comments used?
'email' => false, # user must be emailconfirmed?
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
