Make RC patroling an optional feature that can be turned off by setting wgUseRCPatrol...

Enabled by default

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 1faa21c..5af479e 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -477,6 +477,9 @@ $wgUseValidation = false;
 # extensions package)
 $wgUseExternalDiffEngine = false;
 
+# Use RC Patrolling to check for vandalism
+$wgUseRCPatrol = true;
+
 } else {
        die();
 }

diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index c2c3884..be90b68 100644 (file)
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -19,7 +19,7 @@ class DifferenceEngine {
 
        function showDiffPage()
        {
-               global $wgUser, $wgTitle, $wgOut, $wgLang, $wgOnlySysopsCanPatrol;
+               global $wgUser, $wgTitle, $wgOut, $wgLang, $wgOnlySysopsCanPatrol, $wgUseRCPatrol;
                $fname = "DifferenceEngine::showDiffPage";
                wfProfileIn( $fname );
 
@@ -74,8 +74,9 @@ class DifferenceEngine {
                } else {
                        $rollback = "";
                }
-               if ( $this->mRcidMarkPatrolled != 0 && $wgUser->getID() != 0 &&
-                    ( $wgUser->isSysop() || !$wgOnlySysopsCanPatrol ) )
+               if ( $wgUseRCPatrol && 
+                      ($this->mRcidMarkPatrolled != 0 && $wgUser->getID() != 0 &&
+                      ( $wgUser->isSysop() || !$wgOnlySysopsCanPatrol ) ) )
                {
                        $patrol = " [" . $sk->makeKnownLinkObj( $wgTitle, wfMsg( 'markaspatrolleddiff' ),
                                "action=markpatrolled&rcid={$this->mRcidMarkPatrolled}" ) . "]";

diff --git a/includes/Skin.php b/includes/Skin.php
index 16750d2..aa2acdf 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -2250,7 +2250,7 @@ class Skin {
 
        function recentChangesLineOld( &$rc, $watched = false )
        {
-               global $wgTitle, $wgLang, $wgUser, $wgRCSeconds;
+               global $wgTitle, $wgLang, $wgUser, $wgRCSeconds, $wgUseRCPatrol;
 
                # Extract DB fields into local scope
                extract( $rc->mAttribs );
@@ -2267,7 +2267,7 @@ class Skin {
                }
 
                # If this edit has not yet been patrolled, make it stick out
-               $s .= ( $rc_patrolled ) ? '<li> ' : '<li class="not_patrolled"> ';
+               $s .= ( ! $wgUseRCPatrol || $rc_patrolled ) ? '<li> ' : '<li class="not_patrolled"> ';
 
                if ( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
                        # Diff