From: Marius Hoch <hoo@online.de>
Date: Thu, 13 Jun 2013 23:04:57 +0000 (+0200)
Subject: Fix patrolling where NP patrol isn't explicitly enabled
X-Git-Tag: 1.31.0-rc.0~19429
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=382f706a5be188b32c9006a7c98da3c56e4f4321;p=lhc%2Fweb%2Fwiklou.git

Fix patrolling where NP patrol isn't explicitly enabled

Hot fix! Follow-up fc5bcf1147f9

Change-Id: Iba7e70e1a1ddd9826f6e5f4022b88ccafc5f571d
---

diff --git a/includes/Article.php b/includes/Article.php
index c8e6ce225e..ba922a46ab 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1054,14 +1054,14 @@ class Article implements Page {
 	 * @return bool
 	 */
 	public function showPatrolFooter() {
-		global $wgUseNPPatrol, $wgEnableAPI, $wgEnableWriteAPI;
+		global $wgUseNPPatrol, $wgUseRCPatrol, $wgEnableAPI, $wgEnableWriteAPI;
 
 		$outputPage = $this->getContext()->getOutput();
 		$user = $this->getContext()->getUser();
 		$cache = wfGetMainCache();
 		$rc = false;
 
-		if ( !$this->getTitle()->quickUserCan( 'patrol', $user ) || !$wgUseNPPatrol ) {
+		if ( !$this->getTitle()->quickUserCan( 'patrol', $user ) || !( $wgUseRCPatrol || $wgUseNPPatrol ) ) {
 			// Patrolling is disabled or the user isn't allowed to
 			return false;
 		}