If you really must have a useless $wgUseRCPatrol option, might as well use it

consistently everywhere to ensure that setting it to 0 actually does disable the
feature.  Also, tell the user that it is disabled if they happen to follow a link
with &action=markpatrolled in it.  Additionally, make &action=markpatrolled say
"log in required" if the user is not logged in.

1 files changed, 7 insertions, 6 deletions

diff --git a/includes/SpecialNewpages.php b/includes/SpecialNewpages.php
index d9f85fe145d8..2d9a47a6509a 100644
--- a/includes/SpecialNewpages.php
+++ b/includes/SpecialNewpages.php
@@ -15,8 +15,9 @@ class NewPagesPage extends QueryPage {
 	}
 
 	function getSQL() {
-		global $wgUser, $wgOnlySysopsCanPatrol;
-		$usepatrol = ( $wgUser->getID() != 0 && ( $wgUser->isSysop() || !$wgOnlySysopsCanPatrol ) ) ? 1 : 0;
+		global $wgUser, $wgOnlySysopsCanPatrol, $wgUseRCPatrol;
+		$usepatrol = ( $wgUseRCPatrol && $wgUser->getID() != 0 &&
+		               ( $wgUser->isSysop() || !$wgOnlySysopsCanPatrol ) ) ? 1 : 0;
 		$dbr =& wfGetDB( DB_SLAVE );
 		extract( $dbr->tableNames( 'recentchanges', 'cur' ) );
 
@@ -40,14 +41,14 @@ class NewPagesPage extends QueryPage {
 	}
 
 	function formatResult( $skin, $result ) {
-		global $wgLang, $wgUser, $wgOnlySysopsCanPatrol;
+		global $wgLang, $wgUser, $wgOnlySysopsCanPatrol, $wgUseRCPatrol;
 		$u = $result->user;
 		$ut = $result->user_text;
 
 		$length = wfMsg( "nbytes", $wgLang->formatNum( $result->length ) );
 		$c = $skin->formatComment($result->comment );
 
-		if ( 0 == $u ) { # not by a logged-in user
+		if ( $u == 0 ) { # not by a logged-in user
 			$ul = $ut;
 		}
 		else {
@@ -58,8 +59,8 @@ class NewPagesPage extends QueryPage {
 
 		# Since there is no diff link, we need to give users a way to
 		# mark the article as patrolled if it isn't already
-		if ( $result->usepatrol && $result->patrolled == 0 && $wgUser->getID() != 0 &&
-		     ( $wgUser->isSysop() || !$wgOnlySysopsCanPatrol ) )
+		if ( $wgUseRCPatrol && $result->usepatrol && $result->patrolled == 0 &&
+		     $wgUser->getID() != 0 && ( $wgUser->isSysop() || !$wgOnlySysopsCanPatrol ) )
 			$link = $skin->makeKnownLink( $result->title, '', "rcid={$result->rcid}" );
 		else
 			$link = $skin->makeKnownLink( $result->title, '' );